diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-05-08 11:16:45 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-05-08 11:16:45 +0200 |
| commit | ce3aafaf1b7d3d7e5bc72434d4ec4b369985d506 (patch) | |
| tree | 0ea5153746736e8746b77f59bb5b040e2ae16100 /phpBB | |
| parent | 2341b28f141773358c30b30e2a1494f89416d8bc (diff) | |
| parent | 7f5f5c216bc54eab3259bd0b7560a0b324d01841 (diff) | |
| download | forums-ce3aafaf1b7d3d7e5bc72434d4ec4b369985d506.tar forums-ce3aafaf1b7d3d7e5bc72434d4ec4b369985d506.tar.gz forums-ce3aafaf1b7d3d7e5bc72434d4ec4b369985d506.tar.bz2 forums-ce3aafaf1b7d3d7e5bc72434d4ec4b369985d506.tar.xz forums-ce3aafaf1b7d3d7e5bc72434d4ec4b369985d506.zip | |
Merge branch '3.1.x'
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/viewonline.php | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/phpBB/viewonline.php b/phpBB/viewonline.php index 46f67b93fa..7bd9d07033 100644 --- a/phpBB/viewonline.php +++ b/phpBB/viewonline.php @@ -89,10 +89,26 @@ if ($mode == 'whois' && $auth->acl_get('a_') && $session_id) } // Forum info -$sql = 'SELECT forum_id, forum_name, parent_id, forum_type, left_id, right_id - FROM ' . FORUMS_TABLE . ' - ORDER BY left_id ASC'; -$result = $db->sql_query($sql, 600); +$sql_ary = array( + 'SELECT' => 'f.forum_id, f.forum_name, f.parent_id, f.forum_type, f.left_id, f.right_id', + 'FROM' => array( + FORUMS_TABLE => 'f', + ), + 'ORDER_BY' => 'f.left_id ASC', +); + +/** +* Modify the forum data SQL query for getting additional fields if needed +* +* @event core.viewonline_modify_forum_data_sql +* @var array sql_ary The SQL array +* @since 3.1.5-RC1 +*/ +$vars = array('sql_ary'); +extract($phpbb_dispatcher->trigger_event('core.viewonline_modify_forum_data_sql', compact($vars))); + +$result = $db->sql_query($db->sql_build_query('SELECT', $sql_ary), 600); +unset($sql_ary); $forum_data = array(); while ($row = $db->sql_fetchrow($result)) |