1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-19 15:01:33 +02:00

Merge branch '3.2.x'

This commit is contained in:
Marc Alexander
2018-10-27 22:33:50 +02:00
25 changed files with 64 additions and 64 deletions

View File

@@ -24,7 +24,7 @@ class acp_inactive
var $u_action;
var $p_master;
function acp_inactive(&$p_master)
function __construct(&$p_master)
{
$this->p_master = &$p_master;
}

View File

@@ -24,7 +24,7 @@ class acp_users
var $u_action;
var $p_master;
function acp_users(&$p_master)
function __construct(&$p_master)
{
$this->p_master = &$p_master;
}

View File

@@ -27,7 +27,7 @@ class auth_admin extends \phpbb\auth\auth
/**
* Init auth settings
*/
function auth_admin()
function __construct()
{
global $db, $cache;
@@ -819,7 +819,7 @@ class auth_admin extends \phpbb\auth\auth
// Because we just changed the options and also purged the options cache, we instantly update/regenerate it for later calls to succeed.
$this->acl_options = array();
$this->auth_admin();
$this->__construct();
return true;
}