1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-24 01:20:40 +01:00

Merge branch '3.1.x' into 3.2.x

* 3.1.x:
  [ticket/14806] Fix ACP test emails authentication failure
This commit is contained in:
Tristan Darricau 2017-03-19 18:45:29 +01:00
commit c46efa461e
No known key found for this signature in database
GPG Key ID: 817043C2E29DB881

View File

@ -26,7 +26,7 @@ if (!defined('IN_PHPBB'))
class acp_board
{
var $u_action;
var $new_config = array();
var $new_config;
function main($id, $mode)
{
@ -490,7 +490,7 @@ class acp_board
$user->add_lang($display_vars['lang']);
}
$this->new_config = $config;
$this->new_config = clone $config;
$cfg_array = (isset($_REQUEST['config'])) ? $request->variable('config', array('' => ''), true) : $this->new_config;
$error = array();