From 573987d2d2defe3425c083b093bb5a5d3ec2db2a Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 28 Jun 2013 10:52:13 +0200
Subject: [ticket/11582] Add new service for permissions

Replace calls to the language-array type with a call to get_types()

PHPBB3-11582
---
 phpBB/includes/acp/acp_permissions.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes/acp')

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;
-- 
cgit v1.2.1