Merge pull request #2915 from rxu/ticket/13026

[ticket/13026] Add template vars array to core.viewonline_overwrite_location
This commit is contained in:
Marc Alexander 2014-09-08 16:46:26 +02:00
commit bcd4cebd48

View file

@ -357,22 +357,7 @@ while ($row = $db->sql_fetchrow($result))
break;
}
/**
* Overwrite the location's name and URL, which are displayed in the list
*
* @event core.viewonline_overwrite_location
* @var array on_page File name and query string
* @var array row Array with the users sql row
* @var string location Page name to displayed in the list
* @var string location_url Page url to displayed in the list
* @var array forum_data Array with forum data
* @since 3.1.0-a1
* @change 3.1.0-a2 Added var forum_data
*/
$vars = array('on_page', 'row', 'location', 'location_url', 'forum_data');
extract($phpbb_dispatcher->trigger_event('core.viewonline_overwrite_location', compact($vars)));
$template->assign_block_vars('user_row', array(
$template_row = array(
'USERNAME' => $row['username'],
'USERNAME_COLOUR' => $row['user_colour'],
'USERNAME_FULL' => $username_full,
@ -389,7 +374,26 @@ while ($row = $db->sql_fetchrow($result))
'S_USER_HIDDEN' => $s_user_hidden,
'S_GUEST' => ($row['user_id'] == ANONYMOUS) ? true : false,
'S_USER_TYPE' => $row['user_type'],
));
);
/**
* Overwrite the location's name and URL, which are displayed in the list
*
* @event core.viewonline_overwrite_location
* @var array on_page File name and query string
* @var array row Array with the users sql row
* @var string location Page name to be displayed in the list
* @var string location_url Page url to be displayed in the list
* @var array forum_data Array with forum data
* @var array template_row Array with template variables for the user row
* @since 3.1.0-a1
* @change 3.1.0-a2 Added var forum_data
* @change 3.1.0-RC4 Added var template_row
*/
$vars = array('on_page', 'row', 'location', 'location_url', 'forum_data', 'template_row');
extract($phpbb_dispatcher->trigger_event('core.viewonline_overwrite_location', compact($vars)));
$template->assign_block_vars('user_row', $template_row);
}
$db->sql_freeresult($result);
unset($prev_id, $prev_ip);