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

[ticket/16430] Sort permissions for roles as well

Browse source 
PHPBB3-16430
This commit is contained in:
mrgoldy 2020-05-02 15:29:24 +02:00
parent a2a199b48e
commit 45a00f1a93
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
phpBB/includes/acp/auth.php
View file

@ -1206,9 +1206,11 @@ class auth_admin extends \phpbb\auth\auth
{ {
global $phpbb_container; global $phpbb_container;
/* @var $phpbb_permissions \phpbb\permissions */ /** @var \phpbb\permissions $phpbb_permissions */
$phpbb_permissions = $phpbb_container->get('acl.permissions'); $phpbb_permissions = $phpbb_container->get('acl.permissions');
$order = array_flip(array_keys($phpbb_permissions->get_permissions()));
foreach ($key_sort_array as $forum_id) foreach ($key_sort_array as $forum_id)
{ {
if (!isset($permission_row[$forum_id])) if (!isset($permission_row[$forum_id]))
@ -1216,7 +1218,11 @@ class auth_admin extends \phpbb\auth\auth
continue; continue;
} }
$permissions = $permission_row[$forum_id]; $permissions = array_filter($permission_row[$forum_id], [$phpbb_permissions, 'permission_defined'], ARRAY_FILTER_USE_KEY);
uksort($permissions, function($a, $b) use ($order) {
return $order[$a] <=> $order[$b];
});
foreach ($permissions as $permission => $auth_setting) foreach ($permissions as $permission => $auth_setting)
{ {