aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_permission_roles.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-12-10 15:09:31 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-12-10 15:09:31 +0000
commit564e6782f04ca81ddad8bba5e041aa1bd8914be8 (patch)
treec7e1a8d019744984e44cd51cfccaa89305c72d00 /phpBB/includes/acp/acp_permission_roles.php
parente274c6abc60d4dde3039027954297a8f589777c6 (diff)
downloadforums-564e6782f04ca81ddad8bba5e041aa1bd8914be8.tar
forums-564e6782f04ca81ddad8bba5e041aa1bd8914be8.tar.gz
forums-564e6782f04ca81ddad8bba5e041aa1bd8914be8.tar.bz2
forums-564e6782f04ca81ddad8bba5e041aa1bd8914be8.tar.xz
forums-564e6782f04ca81ddad8bba5e041aa1bd8914be8.zip
- #6110
- #6102 - #6096 git-svn-id: file:///svn/phpbb/trunk@6738 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_permission_roles.php')
-rw-r--r--phpBB/includes/acp/acp_permission_roles.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_permission_roles.php b/phpBB/includes/acp/acp_permission_roles.php
index 004d9f55af..581766e9c8 100644
--- a/phpBB/includes/acp/acp_permission_roles.php
+++ b/phpBB/includes/acp/acp_permission_roles.php
@@ -388,7 +388,7 @@ class acp_permission_roles
while ($row = $db->sql_fetchrow($result))
{
$template->assign_block_vars('roles', array(
- 'ROLE_NAME' => $row['role_name'],
+ 'ROLE_NAME' => (!empty($user->lang[$row['role_name']])) ? $user->lang[$row['role_name']] : $row['role_name'],
'ROLE_DESCRIPTION' => (!empty($user->lang[$row['role_description']])) ? $user->lang[$row['role_description']] : nl2br($row['role_description']),
'U_EDIT' => $this->u_action . '&amp;action=edit&amp;role_id=' . $row['role_id'],