diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-06-28 10:52:13 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-07-14 11:51:29 -0400 |
| commit | 573987d2d2defe3425c083b093bb5a5d3ec2db2a (patch) | |
| tree | 84ea03d64f26b36507a208226d97e1ec6b83c7ce /phpBB/includes/acp/acp_permissions.php | |
| parent | 3d9e57d0cec8f6d7883f8de1e461580047d18709 (diff) | |
| download | forums-573987d2d2defe3425c083b093bb5a5d3ec2db2a.tar forums-573987d2d2defe3425c083b093bb5a5d3ec2db2a.tar.gz forums-573987d2d2defe3425c083b093bb5a5d3ec2db2a.tar.bz2 forums-573987d2d2defe3425c083b093bb5a5d3ec2db2a.tar.xz forums-573987d2d2defe3425c083b093bb5a5d3ec2db2a.zip | |
[ticket/11582] Add new service for permissions
Replace calls to the language-array type with a call to get_types()
PHPBB3-11582
Diffstat (limited to 'phpBB/includes/acp/acp_permissions.php')
| -rw-r--r-- | phpBB/includes/acp/acp_permissions.php | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/phpBB/includes/acp/acp_permissions.php b/phpBB/includes/acp/acp_permissions.php index a64765f4f5..9c5395c5b2 100644 --- a/phpBB/includes/acp/acp_permissions.php +++ b/phpBB/includes/acp/acp_permissions.php @@ -587,7 +587,10 @@ class acp_permissions */ function build_permission_dropdown($options, $default_option, $permission_scope) { - global $user, $auth; + global $user, $auth, $phpbb_container; + + $permissions = $phpbb_container->get('acl.permissions'); + $permission_types = $permissions->get_types(); $s_dropdown_options = ''; foreach ($options as $setting) @@ -598,8 +601,8 @@ class acp_permissions } $selected = ($setting == $default_option) ? ' selected="selected"' : ''; - $l_setting = (isset($user->lang['permission_type'][$permission_scope][$setting])) ? $user->lang['permission_type'][$permission_scope][$setting] : $user->lang['permission_type'][$setting]; - $s_dropdown_options .= '<option value="' . $setting . '"' . $selected . '>' . $l_setting . '</option>'; + $l_setting = (isset($permission_types[$permission_scope][$setting])) ? $permission_types[$permission_scope][$setting] : $permission_types[$setting]; + $s_dropdown_options .= '<option value="' . $setting . '"' . $selected . '>' . $user->lang($l_setting) . '</option>'; } return $s_dropdown_options; |