mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-30 21:40:43 +02:00
Merge branch 'ticket/17107' into ticket/17107-master
This commit is contained in:
@@ -180,6 +180,8 @@ $vars = array('sql_ary', 'show_guests', 'guest_counter', 'forum_data');
|
||||
extract($phpbb_dispatcher->trigger_event('core.viewonline_modify_sql', compact($vars)));
|
||||
|
||||
$result = $db->sql_query($db->sql_build_query('SELECT', $sql_ary));
|
||||
$session_data_rowset = $db->sql_fetchrowset($result);
|
||||
$db->sql_freeresult($result);
|
||||
|
||||
$prev_id = $prev_ip = $user_list = array();
|
||||
$logged_visible_online = $logged_hidden_online = $counter = 0;
|
||||
@@ -190,7 +192,10 @@ $controller_helper = $phpbb_container->get('controller.helper');
|
||||
/** @var \phpbb\group\helper $group_helper */
|
||||
$group_helper = $phpbb_container->get('group_helper');
|
||||
|
||||
while ($row = $db->sql_fetchrow($result))
|
||||
// Get forum IDs for session pages which have only 't' parameter
|
||||
$viewonline_helper->get_forum_ids($session_data_rowset);
|
||||
|
||||
foreach ($session_data_rowset as $row)
|
||||
{
|
||||
if ($row['user_id'] != ANONYMOUS && !isset($prev_id[$row['user_id']]))
|
||||
{
|
||||
@@ -438,7 +443,6 @@ while ($row = $db->sql_fetchrow($result))
|
||||
|
||||
$template->assign_block_vars('user_row', $template_row);
|
||||
}
|
||||
$db->sql_freeresult($result);
|
||||
unset($prev_id, $prev_ip);
|
||||
|
||||
$group_helper->display_legend($db, $template);
|
||||
|
Reference in New Issue
Block a user