aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-01-18 10:00:39 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-01-18 10:00:39 +0000
commite6f685c25f4f0414972498a2d3389ada3ea44bbc (patch)
tree154c465eff37883bca0f134cd31ba697c5e95319 /phpBB/includes
parenta64caea9b627cb6fd4b5f9123d3479c08b4328c4 (diff)
downloadforums-e6f685c25f4f0414972498a2d3389ada3ea44bbc.tar
forums-e6f685c25f4f0414972498a2d3389ada3ea44bbc.tar.gz
forums-e6f685c25f4f0414972498a2d3389ada3ea44bbc.tar.bz2
forums-e6f685c25f4f0414972498a2d3389ada3ea44bbc.tar.xz
forums-e6f685c25f4f0414972498a2d3389ada3ea44bbc.zip
fixing some bugs i introduced while fixing other bugs. :)
git-svn-id: file:///svn/phpbb/trunk@6899 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/acp/acp_permission_roles.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_permission_roles.php b/phpBB/includes/acp/acp_permission_roles.php
index 86ac6f60c5..175b4f00d8 100644
--- a/phpBB/includes/acp/acp_permission_roles.php
+++ b/phpBB/includes/acp/acp_permission_roles.php
@@ -330,9 +330,11 @@ class acp_permission_roles
if (sizeof($hold_ary))
{
+ $role_name = (!empty($user->lang[$role_row['role_name']])) ? $user->lang[$role_row['role_name']] : $role_row['role_name']
+
$template->assign_var(array(
'S_DISPLAY_ROLE_MASK' => true,
- 'L_ROLE_ASSIGNED_TO' => sprintf($user->lang['ROLE_ASSIGNED_TO'], $role_row['role_name']))
+ 'L_ROLE_ASSIGNED_TO' => sprintf($user->lang['ROLE_ASSIGNED_TO'], $role_name))
);
$auth_admin->display_role_mask($hold_ary);