Merge branch '3.2.x'

* 3.2.x:
  [ticket/14806] Fix ACP test emails authentication failure
This commit is contained in:
Tristan Darricau 2017-03-19 18:45:39 +01:00
commit 7d0692eff3
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 class acp_board
{ {
var $u_action; var $u_action;
var $new_config = array(); var $new_config;
function main($id, $mode) function main($id, $mode)
{ {
@ -490,7 +490,7 @@ class acp_board
$user->add_lang($display_vars['lang']); $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; $cfg_array = (isset($_REQUEST['config'])) ? $request->variable('config', array('' => ''), true) : $this->new_config;
$error = array(); $error = array();