diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-11-23 00:54:40 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-11-23 00:54:56 +0100 |
| commit | 943ab555da799fd94b221d5cd0a82fce568de042 (patch) | |
| tree | 613e88d68c78b7680a8e5b3654c52552c7a2598a /phpBB/viewonline.php | |
| parent | e108418824857e670a92f516285455f79bf6e12a (diff) | |
| parent | 0d0b2627f723c3003af0ea301511a972008e7734 (diff) | |
| download | forums-943ab555da799fd94b221d5cd0a82fce568de042.tar forums-943ab555da799fd94b221d5cd0a82fce568de042.tar.gz forums-943ab555da799fd94b221d5cd0a82fce568de042.tar.bz2 forums-943ab555da799fd94b221d5cd0a82fce568de042.tar.xz forums-943ab555da799fd94b221d5cd0a82fce568de042.zip | |
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11912
Conflicts:
phpBB/config/services.yml
Diffstat (limited to 'phpBB/viewonline.php')
| -rw-r--r-- | phpBB/viewonline.php | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/phpBB/viewonline.php b/phpBB/viewonline.php index 6b26a3f5d6..d6a6a79342 100644 --- a/phpBB/viewonline.php +++ b/phpBB/viewonline.php @@ -139,9 +139,12 @@ $sql_ary = array( * @event core.viewonline_modify_sql * @var array sql_ary The SQL array * @var bool show_guests Do we display guests in the list +* @var int guest_counter Number of guests displayed +* @var array forum_data Array with forum data * @since 3.1-A1 +* @change 3.1.0-a2 Added vars guest_counter and forum_data */ -$vars = array('sql_ary', 'show_guests'); +$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)); @@ -345,9 +348,11 @@ while ($row = $db->sql_fetchrow($result)) * @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-A1 + * @change 3.1.0-a2 Added var forum_data */ - $vars = array('on_page', 'row', 'location', 'location_url'); + $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( |