diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-11-23 16:15:46 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-11-23 16:15:46 +0000 |
| commit | 59f3e65aeeb7f9cb2f393dd36f70e67fd62e9086 (patch) | |
| tree | 0dbed962c29ae526f59adf9995252ef76155571b /phpBB/memberlist.php | |
| parent | 6d6f433d2eec895bb6cd61e286d289434faae9ba (diff) | |
| download | forums-59f3e65aeeb7f9cb2f393dd36f70e67fd62e9086.tar forums-59f3e65aeeb7f9cb2f393dd36f70e67fd62e9086.tar.gz forums-59f3e65aeeb7f9cb2f393dd36f70e67fd62e9086.tar.bz2 forums-59f3e65aeeb7f9cb2f393dd36f70e67fd62e9086.tar.xz forums-59f3e65aeeb7f9cb2f393dd36f70e67fd62e9086.zip | |
fixes for bugs #5564, #5554 and #5462
git-svn-id: file:///svn/phpbb/trunk@6643 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/memberlist.php')
| -rw-r--r-- | phpBB/memberlist.php | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index 150bdb4941..6231910509 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -195,7 +195,7 @@ switch ($mode) // instead of saying they are moderating all forums if (!$s_forum_select && $undisclosed_forum) { - $s_forum_select = $user->lang['FORUM_UNDISCLOSED']; + $s_forum_select = '<option value="">' . $user->lang['FORUM_UNDISCLOSED'] . '</option>'; } if ($row['group_type'] == GROUP_HIDDEN && !$auth->acl_gets('a_group', 'a_groupadd', 'a_groupdel') && $row['ug_user_id'] != $user->data['user_id']) @@ -215,8 +215,6 @@ switch ($mode) $template->assign_block_vars($which_row, array( 'USER_ID' => $row['user_id'], 'FORUMS' => $s_forum_select, - 'USERNAME' => $row['username'], - 'USER_COLOR' => $row['user_colour'], 'RANK_TITLE' => $rank_title, 'GROUP_NAME' => $group_name, 'GROUP_COLOR' => $row['group_colour'], @@ -225,9 +223,13 @@ switch ($mode) 'RANK_IMG_SRC' => $rank_img_src, 'U_GROUP' => $u_group, - 'U_VIEW_PROFILE' => append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=viewprofile&u=' . $row['user_id']), - 'U_PM' => ($config['allow_privmsg'] && $auth->acl_get('u_sendpm')) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&mode=compose&u=' . $row['user_id']) : '') - ); + 'U_PM' => ($config['allow_privmsg'] && $auth->acl_get('u_sendpm')) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&mode=compose&u=' . $row['user_id']) : '', + + 'USERNAME_FULL' => get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']), + 'USERNAME' => get_username_string('username', $row['user_id'], $row['username'], $row['user_colour']), + 'USER_COLOR' => get_username_string('colour', $row['user_id'], $row['username'], $row['user_colour']), + 'U_VIEW_PROFILE' => get_username_string('profile', $row['user_id'], $row['username'], $row['user_colour']), + )); } $db->sql_freeresult($result); |