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.3.x'

Browse source
This commit is contained in:
Marc Alexander 2020-04-21 22:03:44 +02:00
commit 699a89c57b
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
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_permissions.php
View file

@ -44,8 +44,6 @@ class acp_permissions
include($phpbb_root_path . 'includes/acp/auth.' . $phpEx); include($phpbb_root_path . 'includes/acp/auth.' . $phpEx);
} }
$this->permissions = $phpbb_container->get('acl.permissions');
$auth_admin = new auth_admin(); $auth_admin = new auth_admin();
$user->add_lang('acp/permissions'); $user->add_lang('acp/permissions');
@ -53,6 +51,8 @@ class acp_permissions
$this->tpl_name = 'acp_permissions'; $this->tpl_name = 'acp_permissions';
$this->permissions = $phpbb_container->get('acl.permissions');
// Trace has other vars // Trace has other vars
if ($mode == 'trace') if ($mode == 'trace')
{ {