mirror of
https://github.com/phpbb/phpbb.git
synced 2025-03-13 20:28:44 +01:00
Merge pull request #5958 from kasimi/ticket/16453
[ticket/16453] Load permission lang files before core.permissions
This commit is contained in:
commit
0f51a85d8f
@ -44,8 +44,6 @@ class acp_permissions
|
||||
include($phpbb_root_path . 'includes/acp/auth.' . $phpEx);
|
||||
}
|
||||
|
||||
$this->permissions = $phpbb_container->get('acl.permissions');
|
||||
|
||||
$auth_admin = new auth_admin();
|
||||
|
||||
$user->add_lang('acp/permissions');
|
||||
@ -53,6 +51,8 @@ class acp_permissions
|
||||
|
||||
$this->tpl_name = 'acp_permissions';
|
||||
|
||||
$this->permissions = $phpbb_container->get('acl.permissions');
|
||||
|
||||
// Trace has other vars
|
||||
if ($mode == 'trace')
|
||||
{
|
||||
|
Loading…
x
Reference in New Issue
Block a user