makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.1.x' into 3.2.x

Browse source 
* 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
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/includes/acp/acp_board.php
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();