diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2017-03-19 18:44:41 +0100 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2017-03-19 18:44:41 +0100 |
| commit | 6abcfe41e0d0764211fa1d69342ea1beccbbea3e (patch) | |
| tree | a00ab8380a51235b43323ce9f01855dd3cfe838e /phpBB | |
| parent | c8670d532474bd75f4f643a0595ba74e9785fc04 (diff) | |
| parent | 4826f7c1d3f6344ce8136f58f26d8c53b953652d (diff) | |
| download | forums-6abcfe41e0d0764211fa1d69342ea1beccbbea3e.tar forums-6abcfe41e0d0764211fa1d69342ea1beccbbea3e.tar.gz forums-6abcfe41e0d0764211fa1d69342ea1beccbbea3e.tar.bz2 forums-6abcfe41e0d0764211fa1d69342ea1beccbbea3e.tar.xz forums-6abcfe41e0d0764211fa1d69342ea1beccbbea3e.zip | |
Merge pull request #4734 from rxu/ticket/14806
[ticket/14806] Fix ACP test emails authentication failure
* github.com:phpbb/phpbb:
[ticket/14806] Fix ACP test emails authentication failure
Diffstat (limited to 'phpBB')
| -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 d9e30320af..bcecb2f300 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) { @@ -485,7 +485,7 @@ class acp_board $user->add_lang($display_vars['lang']); } - $this->new_config = $config; + $this->new_config = clone $config; $cfg_array = (isset($_REQUEST['config'])) ? utf8_normalize_nfc(request_var('config', array('' => ''), true)) : $this->new_config; $error = array(); |