diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-07-06 13:37:59 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-07-14 11:51:36 -0400 |
| commit | 9c653341e4d747302bdde1273fd71199ca3b40ef (patch) | |
| tree | 474bf58d3d6c4c54e2fccaa9270167f9c8217081 /phpBB/includes/acp/acp_permissions.php | |
| parent | ce0a182c7fcd0c67020a44109440cd807bee2e82 (diff) | |
| download | forums-9c653341e4d747302bdde1273fd71199ca3b40ef.tar forums-9c653341e4d747302bdde1273fd71199ca3b40ef.tar.gz forums-9c653341e4d747302bdde1273fd71199ca3b40ef.tar.bz2 forums-9c653341e4d747302bdde1273fd71199ca3b40ef.tar.xz forums-9c653341e4d747302bdde1273fd71199ca3b40ef.zip | |
[ticket/11582] Use new methods and remove duplicated entries
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 13e0f1c535..17c6561b65 100644 --- a/phpBB/includes/acp/acp_permissions.php +++ b/phpBB/includes/acp/acp_permissions.php @@ -510,9 +510,12 @@ class acp_permissions trigger_error($user->lang['ONLY_FORUM_DEFINED'] . adm_back_link($this->u_action), E_USER_WARNING); } + global $phpbb_container; + $phpbb_permissions = $phpbb_container->get('acl.permissions'); + $template->assign_vars(array( 'S_PERMISSION_DROPDOWN' => (sizeof($this->permission_dropdown) > 1) ? $this->build_permission_dropdown($this->permission_dropdown, $permission_type, $permission_scope) : false, - 'L_PERMISSION_TYPE' => $user->lang['ACL_TYPE_' . strtoupper($permission_type)], + 'L_PERMISSION_TYPE' => $phpbb_permissions->get_type_lang($permission_type), 'U_ACTION' => $this->u_action, 'S_HIDDEN_FIELDS' => $s_hidden_fields) @@ -589,7 +592,7 @@ class acp_permissions { global $auth, $phpbb_container; - $permissions = $phpbb_container->get('acl.permissions'); + $phpbb_permissions = $phpbb_container->get('acl.permissions'); $s_dropdown_options = ''; foreach ($options as $setting) @@ -600,7 +603,7 @@ class acp_permissions } $selected = ($setting == $default_option) ? ' selected="selected"' : ''; - $l_setting = $permissions->get_lang_type($setting, $permission_scope); + $l_setting = $phpbb_permissions->get_type_lang($setting, $permission_scope); $s_dropdown_options .= '<option value="' . $setting . '"' . $selected . '>' . $l_setting . '</option>'; } |