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

[ticket/11582] Remove left over calls to lang['acl_*']

Browse source 
PHPBB3-11582
This commit is contained in:
Joas Schilling 2013-07-06 13:57:58 +02:00
parent 22ba3de1a2
commit aadff800dc
2 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/acp/acp_permission_roles.php
View file

@ -492,7 +492,7 @@ class acp_permission_roles
'S_NO' => ($allowed == ACL_NO) ? true : false, 'S_NO' => ($allowed == ACL_NO) ? true : false,
'FIELD_NAME' => $permission, 'FIELD_NAME' => $permission,
'PERMISSION' => $user->lang['acl_' . $permission]['lang']) 'PERMISSION' => $phpbb_permissions->get_permission_lang($permission)
); );
} }
} }

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

@ -1148,8 +1148,8 @@ class auth_admin extends phpbb_auth
'U_TRACE' => ($show_trace) ? append_sid("{$phpbb_admin_path}index.$phpEx", "i=permissions&mode=trace&u=$ug_id&f=$forum_id&auth=$permission") : '', 'U_TRACE' => ($show_trace) ? append_sid("{$phpbb_admin_path}index.$phpEx", "i=permissions&mode=trace&u=$ug_id&f=$forum_id&auth=$permission") : '',
'UA_TRACE' => ($show_trace) ? append_sid("{$phpbb_admin_path}index.$phpEx", "i=permissions&mode=trace&u=$ug_id&f=$forum_id&auth=$permission", false) : '', 'UA_TRACE' => ($show_trace) ? append_sid("{$phpbb_admin_path}index.$phpEx", "i=permissions&mode=trace&u=$ug_id&f=$forum_id&auth=$permission", false) : '',
'PERMISSION' => $user->lang['acl_' . $permission]['lang']) 'PERMISSION' => $phpbb_permissions->get_permission_lang($permission),
); ));
} }
else else
{ {
@ -1166,8 +1166,8 @@ class auth_admin extends phpbb_auth
'U_TRACE' => ($show_trace) ? append_sid("{$phpbb_admin_path}index.$phpEx", "i=permissions&mode=trace&u=$ug_id&f=$forum_id&auth=$permission") : '', 'U_TRACE' => ($show_trace) ? append_sid("{$phpbb_admin_path}index.$phpEx", "i=permissions&mode=trace&u=$ug_id&f=$forum_id&auth=$permission") : '',
'UA_TRACE' => ($show_trace) ? append_sid("{$phpbb_admin_path}index.$phpEx", "i=permissions&mode=trace&u=$ug_id&f=$forum_id&auth=$permission", false) : '', 'UA_TRACE' => ($show_trace) ? append_sid("{$phpbb_admin_path}index.$phpEx", "i=permissions&mode=trace&u=$ug_id&f=$forum_id&auth=$permission", false) : '',
'PERMISSION' => $user->lang['acl_' . $permission]['lang']) 'PERMISSION' => $phpbb_permissions->get_permission_lang($permission),
); ));
} }
} }
} }
@ -1196,15 +1196,7 @@ class auth_admin extends phpbb_auth
@reset($permissions); @reset($permissions);
while (list($permission, $auth_setting) = each($permissions)) while (list($permission, $auth_setting) = each($permissions))
{ {
if (!isset($user->lang['acl_' . $permission])) $cat = $phpbb_permissions->get_permission_category($permission);
{
$user->lang['acl_' . $permission] = array(
'cat' => 'misc',
'lang' => '{ acl_' . $permission . ' }'
);
}
$cat = $user->lang['acl_' . $permission]['cat'];
// Build our categories array // Build our categories array
if (!isset($categories[$cat])) if (!isset($categories[$cat]))