aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/auth.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2013-06-28 11:40:00 +0200
committerJoas Schilling <nickvergessen@gmx.de>2013-07-14 11:51:34 -0400
commitce0a182c7fcd0c67020a44109440cd807bee2e82 (patch)
tree982da49e530893758274385edd921a44ee3e7dc0 /phpBB/includes/acp/auth.php
parent7f9a1c811647c00b20cfa4f5029f6b569597cb4b (diff)
downloadforums-ce0a182c7fcd0c67020a44109440cd807bee2e82.tar
forums-ce0a182c7fcd0c67020a44109440cd807bee2e82.tar.gz
forums-ce0a182c7fcd0c67020a44109440cd807bee2e82.tar.bz2
forums-ce0a182c7fcd0c67020a44109440cd807bee2e82.tar.xz
forums-ce0a182c7fcd0c67020a44109440cd807bee2e82.zip
[ticket/11582] Add methods to return the language string
PHPBB3-11582
Diffstat (limited to 'phpBB/includes/acp/auth.php')
-rw-r--r--phpBB/includes/acp/auth.php6
1 files changed, 2 insertions, 4 deletions
diff --git a/phpBB/includes/acp/auth.php b/phpBB/includes/acp/auth.php
index 03cc0c1705..7a7ccc0c50 100644
--- a/phpBB/includes/acp/auth.php
+++ b/phpBB/includes/acp/auth.php
@@ -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