diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-05-01 12:44:28 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-05-01 12:44:28 +0000 |
| commit | 6724e1bab6ec2faf13fc104751ba63cbb293dae4 (patch) | |
| tree | 02bd221ba70e156441f548d6083205b138846296 /phpBB/includes | |
| parent | 9918f8ee935beb80cde971de968595c15732b2ee (diff) | |
| download | forums-6724e1bab6ec2faf13fc104751ba63cbb293dae4.tar forums-6724e1bab6ec2faf13fc104751ba63cbb293dae4.tar.gz forums-6724e1bab6ec2faf13fc104751ba63cbb293dae4.tar.bz2 forums-6724e1bab6ec2faf13fc104751ba63cbb293dae4.tar.xz forums-6724e1bab6ec2faf13fc104751ba63cbb293dae4.zip | |
- added standard/default roles + default roles assigned to users/groups
git-svn-id: file:///svn/phpbb/trunk@5872 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_permission_roles.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/acp/auth.php | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/phpBB/includes/acp/acp_permission_roles.php b/phpBB/includes/acp/acp_permission_roles.php index 1088d9d2fb..c161f8c0f2 100644 --- a/phpBB/includes/acp/acp_permission_roles.php +++ b/phpBB/includes/acp/acp_permission_roles.php @@ -385,7 +385,7 @@ class acp_permission_roles { $template->assign_block_vars('roles', array( 'ROLE_NAME' => $row['role_name'], - 'ROLE_DESCRIPTION' => nl2br($row['role_description']), + 'ROLE_DESCRIPTION' => (!empty($user->lang[$row['role_description']])) ? $user->lang[$row['role_description']] : nl2br($row['role_description']), 'U_EDIT' => $this->u_action . '&action=edit&role_id=' . $row['role_id'], 'U_REMOVE' => $this->u_action . '&action=remove&role_id=' . $row['role_id'], diff --git a/phpBB/includes/acp/auth.php b/phpBB/includes/acp/auth.php index 9bb80f4ac0..ea4c664294 100644 --- a/phpBB/includes/acp/auth.php +++ b/phpBB/includes/acp/auth.php @@ -414,7 +414,8 @@ class auth_admin extends auth $s_role_options = ''; foreach ($roles as $role_id => $role_row) { - $title = ($role_row['role_description']) ? ' title="' . nl2br($role_row['role_description']) . '"' : ''; + $role_description = (!empty($user->lang[$role_row['role_description']])) ? $user->lang[$role_row['role_description']] : nl2br($role_row['role_description']); + $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>'; } @@ -471,7 +472,8 @@ class auth_admin extends auth $s_role_options = ''; foreach ($roles as $role_id => $role_row) { - $title = ($role_row['role_description']) ? ' title="' . nl2br($role_row['role_description']) . '"' : ''; + $role_description = (!empty($user->lang[$role_row['role_description']])) ? $user->lang[$role_row['role_description']] : nl2br($role_row['role_description']); + $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>'; } |