diff options
| author | Matt Friedman <maf675@gmail.com> | 2014-09-08 15:54:16 -0700 |
|---|---|---|
| committer | Matt Friedman <maf675@gmail.com> | 2014-09-08 15:54:16 -0700 |
| commit | c6fc455432a9f8df5849176c6d72b03144f319e4 (patch) | |
| tree | c049e533c72f68f19a64d15df674739cc7825bc1 /phpBB/viewonline.php | |
| parent | bcd4cebd489a7c71b97b608b921e8b89e676fcc4 (diff) | |
| download | forums-c6fc455432a9f8df5849176c6d72b03144f319e4.tar forums-c6fc455432a9f8df5849176c6d72b03144f319e4.tar.gz forums-c6fc455432a9f8df5849176c6d72b03144f319e4.tar.bz2 forums-c6fc455432a9f8df5849176c6d72b03144f319e4.tar.xz forums-c6fc455432a9f8df5849176c6d72b03144f319e4.zip | |
[ticket/13051] Fix viewonline event, remove template data
PHPBB3-13051
Diffstat (limited to 'phpBB/viewonline.php')
| -rw-r--r-- | phpBB/viewonline.php | 38 |
1 files changed, 17 insertions, 21 deletions
diff --git a/phpBB/viewonline.php b/phpBB/viewonline.php index 708d7c2349..a03a81a15e 100644 --- a/phpBB/viewonline.php +++ b/phpBB/viewonline.php @@ -357,7 +357,22 @@ while ($row = $db->sql_fetchrow($result)) break; } - $template_row = array( + /** + * 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( 'USERNAME' => $row['username'], 'USERNAME_COLOUR' => $row['user_colour'], 'USERNAME_FULL' => $username_full, @@ -374,26 +389,7 @@ 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); |