diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-12-02 13:19:40 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-12-02 13:19:40 +0000 |
| commit | 7ad986c37e15bc51f5dc2cb42a4fa6445fde51e3 (patch) | |
| tree | b2bbf1e855f1c185f76972777cef56b29e5e10d2 /phpBB/ucp.php | |
| parent | de1c536548c5b41d33a16f3afe12ba67000d7210 (diff) | |
| download | forums-7ad986c37e15bc51f5dc2cb42a4fa6445fde51e3.tar forums-7ad986c37e15bc51f5dc2cb42a4fa6445fde51e3.tar.gz forums-7ad986c37e15bc51f5dc2cb42a4fa6445fde51e3.tar.bz2 forums-7ad986c37e15bc51f5dc2cb42a4fa6445fde51e3.tar.xz forums-7ad986c37e15bc51f5dc2cb42a4fa6445fde51e3.zip | |
- a bunch of fixes
- added todos to the updater to make sure i do not forget. :)
git-svn-id: file:///svn/phpbb/trunk@6698 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/ucp.php')
| -rwxr-xr-x | phpBB/ucp.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/ucp.php b/phpBB/ucp.php index d1461c1764..d0163d9daf 100755 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -244,7 +244,7 @@ if (!$user->data['is_registered']) $update_time = $config['load_online_time'] * 60; $sql = $db->sql_build_query('SELECT_DISTINCT', array( - 'SELECT' => 'u.user_id, u.username, u.user_colour, u.user_allow_viewonline, MAX(s.session_time) as online_time, MIN(s.session_viewonline) AS viewonline', + 'SELECT' => 'u.user_id, u.username, u.username_clean, u.user_colour, u.user_allow_viewonline, MAX(s.session_time) as online_time, MIN(s.session_viewonline) AS viewonline', 'FROM' => array( USERS_TABLE => 'u', @@ -262,7 +262,7 @@ $sql = $db->sql_build_query('SELECT_DISTINCT', array( AND z.friend = 1 AND u.user_id = z.zebra_id', - 'GROUP_BY' => 'z.zebra_id, u.user_id, u.username, u.user_allow_viewonline, u.user_colour', + 'GROUP_BY' => 'z.zebra_id, u.user_id, u.username_clean, u.user_allow_viewonline, u.user_colour, u.username', 'ORDER_BY' => 'u.username_clean ASC', )); |