diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2017-03-19 18:45:29 +0100 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2017-03-19 18:45:29 +0100 |
| commit | c46efa461e6224e0863e18fda52a131fe7e690f1 (patch) | |
| tree | f63923a69e0b7cb5e3f9cb7e3abc0b83ea5824ad /phpBB/includes/acp/acp_board.php | |
| parent | ed2d0863021d0449fe16d769ff2e76781f2c6813 (diff) | |
| parent | 6abcfe41e0d0764211fa1d69342ea1beccbbea3e (diff) | |
| download | forums-c46efa461e6224e0863e18fda52a131fe7e690f1.tar forums-c46efa461e6224e0863e18fda52a131fe7e690f1.tar.gz forums-c46efa461e6224e0863e18fda52a131fe7e690f1.tar.bz2 forums-c46efa461e6224e0863e18fda52a131fe7e690f1.tar.xz forums-c46efa461e6224e0863e18fda52a131fe7e690f1.zip | |
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
[ticket/14806] Fix ACP test emails authentication failure
Diffstat (limited to 'phpBB/includes/acp/acp_board.php')
| -rw-r--r-- | phpBB/includes/acp/acp_board.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index a2644c0e37..956ff7cf0f 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -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(); |