diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-10-12 10:20:32 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-10-12 10:20:32 +0200 |
| commit | ce45813e2c1da33b006e1418f20dddc7711e8ac4 (patch) | |
| tree | d4c44735471640ab840a5b79f5f6606277d5bad6 /phpBB/includes | |
| parent | fcf797c3f262df43ed2df5fdd6718dd61b38ea60 (diff) | |
| parent | 2668fa42ad977078883724e546e67c3439f28d58 (diff) | |
| download | forums-ce45813e2c1da33b006e1418f20dddc7711e8ac4.tar forums-ce45813e2c1da33b006e1418f20dddc7711e8ac4.tar.gz forums-ce45813e2c1da33b006e1418f20dddc7711e8ac4.tar.bz2 forums-ce45813e2c1da33b006e1418f20dddc7711e8ac4.tar.xz forums-ce45813e2c1da33b006e1418f20dddc7711e8ac4.zip | |
Merge branch '3.1.x'
* 3.1.x:
[ticket/13591] Change SQL query into array to allow
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions.php | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 9389a2df28..b7a5bee3c4 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3618,10 +3618,14 @@ function obtain_users_online_string($online_users, $item_id = 0, $item = 'forum' if (sizeof($online_users['online_users'])) { - $sql = 'SELECT username, username_clean, user_id, user_type, user_allow_viewonline, user_colour - FROM ' . USERS_TABLE . ' - WHERE ' . $db->sql_in_set('user_id', $online_users['online_users']) . ' - ORDER BY username_clean ASC'; + $sql_ary = array( + 'SELECT' => 'u.username, u.username_clean, u.user_id, u.user_type, u.user_allow_viewonline, u.user_colour', + 'FROM' => array( + USERS_TABLE => 'u', + ), + 'WHERE' => $db->sql_in_set('u.user_id', $online_users['online_users']), + 'ORDER BY' => 'u.username_clean ASC', + ); /** * Modify SQL query to obtain online users data @@ -3633,13 +3637,14 @@ function obtain_users_online_string($online_users, $item_id = 0, $item = 'forum' * @var string item Restrict online users to a certain * session item, e.g. forum for * session_forum_id - * @var string sql SQL query to obtain users online data + * @var string sql_ary SQL query to obtain users online data * @since 3.1.4-RC1 + * @changed 3.1.7-RC1 Change sql query into array and adjust var accordingly. Allows extension authors the ability to adjust the sql_ary. */ - $vars = array('online_users', 'item_id', 'item', 'sql'); + $vars = array('online_users', 'item_id', 'item', 'sql_ary'); extract($phpbb_dispatcher->trigger_event('core.obtain_users_online_string_sql', compact($vars))); - $result = $db->sql_query($sql); + $result = $db->sql_query($db->sql_build_query('SELECT', $sql_ary)); $rowset = $db->sql_fetchrowset($result); $db->sql_freeresult($result); |