aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/auth.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/auth.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/auth.php')
-rw-r--r--phpBB/includes/acp/auth.php8
1 files changed, 6 insertions, 2 deletions
diff --git a/phpBB/includes/acp/auth.php b/phpBB/includes/acp/auth.php
index 35b0cd29e2..b6ec69a347 100644
--- a/phpBB/includes/acp/auth.php
+++ b/phpBB/includes/acp/auth.php
@@ -462,8 +462,10 @@ class auth_admin extends auth
foreach ($roles as $role_id => $role_row)
{
$role_description = (!empty($user->lang[$role_row['role_description']])) ? $user->lang[$role_row['role_description']] : nl2br($role_row['role_description']);
+ $role_name = (!empty($user->lang[$role_row['role_name']])) ? $user->lang[$role_row['role_name']] : $role_row['role_name'];
+
$title = ($role_description) ? ' title="' . $role_description . '"' : '';
- $s_role_options .= '<option value="' . $role_id . '"' . (($role_id == $current_role_id) ? ' selected="selected"' : '') . $title . '>' . $role_row['role_name'] . '</option>';
+ $s_role_options .= '<option value="' . $role_id . '"' . (($role_id == $current_role_id) ? ' selected="selected"' : '') . $title . '>' . $role_name . '</option>';
}
if ($s_role_options)
@@ -520,8 +522,10 @@ class auth_admin extends auth
foreach ($roles as $role_id => $role_row)
{
$role_description = (!empty($user->lang[$role_row['role_description']])) ? $user->lang[$role_row['role_description']] : nl2br($role_row['role_description']);
+ $role_name = (!empty($user->lang[$role_row['role_name']])) ? $user->lang[$role_row['role_name']] : $role_row['role_name'];
+
$title = ($role_description) ? ' title="' . $role_description . '"' : '';
- $s_role_options .= '<option value="' . $role_id . '"' . (($role_id == $current_role_id) ? ' selected="selected"' : '') . $title . '>' . $role_row['role_name'] . '</option>';
+ $s_role_options .= '<option value="' . $role_id . '"' . (($role_id == $current_role_id) ? ' selected="selected"' : '') . $title . '>' . $role_name . '</option>';
}
if ($s_role_options)