diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-11-24 21:51:10 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-11-24 21:51:10 -0500 |
| commit | 90a7f55831e563265cb2f9dbf4ac8cdd26c1a5fa (patch) | |
| tree | da2116f54c64f11ef5ea932ff0d91bf3936c112b /phpBB/ucp.php | |
| parent | 6b2b98d8550d47c2d9c58d8acd2e9314e1022a87 (diff) | |
| parent | 4c77903129749008cd08c346006d2a57cf6ff544 (diff) | |
| download | forums-90a7f55831e563265cb2f9dbf4ac8cdd26c1a5fa.tar forums-90a7f55831e563265cb2f9dbf4ac8cdd26c1a5fa.tar.gz forums-90a7f55831e563265cb2f9dbf4ac8cdd26c1a5fa.tar.bz2 forums-90a7f55831e563265cb2f9dbf4ac8cdd26c1a5fa.tar.xz forums-90a7f55831e563265cb2f9dbf4ac8cdd26c1a5fa.zip | |
Merge remote-tracking branch 'nickvergessen/ticket/10484' into develop
* nickvergessen/ticket/10484:
[ticket/10484] Use variables for sql_build_query() calls
Conflicts:
phpBB/includes/mcp/mcp_front.php
Diffstat (limited to 'phpBB/ucp.php')
| -rw-r--r-- | phpBB/ucp.php | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/phpBB/ucp.php b/phpBB/ucp.php index 505dbb998b..c8a0795bcb 100644 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -274,19 +274,19 @@ if ($module->is_active('zebra', 'friends')) // Output listing of friends online $update_time = $config['load_online_time'] * 60; - $sql = $db->sql_build_query('SELECT_DISTINCT', array( + $sql_ary = array( 'SELECT' => 'u.user_id, u.username, u.username_clean, u.user_colour, MAX(s.session_time) as online_time, MIN(s.session_viewonline) AS viewonline', 'FROM' => array( USERS_TABLE => 'u', - ZEBRA_TABLE => 'z' + ZEBRA_TABLE => 'z', ), 'LEFT_JOIN' => array( array( 'FROM' => array(SESSIONS_TABLE => 's'), - 'ON' => 's.session_user_id = z.zebra_id' - ) + 'ON' => 's.session_user_id = z.zebra_id', + ), ), 'WHERE' => 'z.user_id = ' . $user->data['user_id'] . ' @@ -296,8 +296,9 @@ if ($module->is_active('zebra', 'friends')) 'GROUP_BY' => 'z.zebra_id, u.user_id, u.username_clean, u.user_colour, u.username', 'ORDER_BY' => 'u.username_clean ASC', - )); + ); + $sql = $db->sql_build_query('SELECT_DISTINCT', $sql_ary); $result = $db->sql_query($sql); while ($row = $db->sql_fetchrow($result)) |