diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-12-10 15:09:31 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-12-10 15:09:31 +0000 |
| commit | 564e6782f04ca81ddad8bba5e041aa1bd8914be8 (patch) | |
| tree | c7e1a8d019744984e44cd51cfccaa89305c72d00 /phpBB/includes | |
| parent | e274c6abc60d4dde3039027954297a8f589777c6 (diff) | |
| download | forums-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')
| -rw-r--r-- | phpBB/includes/acp/acp_permission_roles.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_users.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/acp/auth.php | 8 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_profile.php | 2 |
4 files changed, 9 insertions, 5 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 . '&action=edit&role_id=' . $row['role_id'], diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 314514b8e2..28125df3ed 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -1032,7 +1032,7 @@ class acp_users 'icq' => array( array('string', true, 3, 15), array('match', true, '#^[0-9]+$#i')), - 'aim' => array('string', true, 3, 17), + 'aim' => array('string', true, 3, 255), 'msn' => array('string', true, 5, 255), 'jabber' => array( array('string', true, 5, 255), 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) diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index cfd6f217c0..a979f73e93 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -272,7 +272,7 @@ class ucp_profile 'icq' => array( array('string', true, 3, 15), array('match', true, '#^[0-9]+$#i')), - 'aim' => array('string', true, 3, 17), + 'aim' => array('string', true, 3, 255), 'msn' => array('string', true, 5, 255), 'jabber' => array( array('string', true, 5, 255), |