mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-08 17:56:52 +02:00
Code Issues Releases Wiki Activity

[ticket/11582] Add methods to return the language string

Browse Source 
PHPBB3-11582
This commit is contained in:
Joas Schilling
2013-06-28 11:40:00 +02:00
parent 7f9a1c8116
commit ce0a182c7f
4 changed files with 35 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/includes/acp/auth.php
View File

@@ -1103,7 +1103,6 @@ class auth_admin extends phpbb_auth
global $template, $user, $phpbb_admin_path, $phpEx, $phpbb_container;
$permissions = $phpbb_container->get('acl.permissions');
$permission_categories = $permissions->get_categories();
@reset($category_array);
while (list($cat, $cat_array) = each($category_array))
@@ -1113,7 +1112,7 @@ class auth_admin extends phpbb_auth
'S_NEVER' => ($cat_array['S_NEVER'] && !$cat_array['S_YES'] && !$cat_array['S_NO']) ? true : false,
'S_NO' => ($cat_array['S_NO'] && !$cat_array['S_NEVER'] && !$cat_array['S_YES']) ? true : false,
'CAT_NAME' => $user->lang($permission_categories[$cat]),
'CAT_NAME' => $permissions->get_lang_category($cat),
));
/* Sort permissions by name (more naturaly and user friendly than sorting by a primary key)
@@ -1182,7 +1181,6 @@ class auth_admin extends phpbb_auth
global $user, $phpbb_container;
$permissions = $phpbb_container->get('acl.permissions');
$permission_categories = $permissions->get_categories();
foreach ($key_sort_array as $forum_id)
{
@@ -1210,7 +1208,7 @@ class auth_admin extends phpbb_auth
// Build our categories array
if (!isset($categories[$cat]))
{
$categories[$cat] = $user->lang($permission_categories[$cat]);
$categories[$cat] = $permissions->get_lang_category($cat);
}
// Build our content array