diff options
| author | javiexin <javiexin@gmail.com> | 2017-03-05 15:07:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-05 15:07:26 +0100 |
| commit | 376e85c1d66c7223027afcdbfccf5c9e985cca73 (patch) | |
| tree | b68cff3c8b8b982b55580766b87f25e3db65dfdf /phpBB/viewonline.php | |
| parent | fc50fd272b9685221e130114b2365b23bd543048 (diff) | |
| parent | 9267235f30b3275b4b00f49f99c6ae259ce26a3f (diff) | |
| download | forums-376e85c1d66c7223027afcdbfccf5c9e985cca73.tar forums-376e85c1d66c7223027afcdbfccf5c9e985cca73.tar.gz forums-376e85c1d66c7223027afcdbfccf5c9e985cca73.tar.bz2 forums-376e85c1d66c7223027afcdbfccf5c9e985cca73.tar.xz forums-376e85c1d66c7223027afcdbfccf5c9e985cca73.zip | |
Merge branch '3.1.x' into ticket/15081
Diffstat (limited to 'phpBB/viewonline.php')
| -rw-r--r-- | phpBB/viewonline.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/viewonline.php b/phpBB/viewonline.php index 8bfa422e26..5cb1175528 100644 --- a/phpBB/viewonline.php +++ b/phpBB/viewonline.php @@ -168,7 +168,7 @@ $sql_ary = array( * @var int guest_counter Number of guests displayed * @var array forum_data Array with forum data * @since 3.1.0-a1 -* @change 3.1.0-a2 Added vars guest_counter and forum_data +* @changed 3.1.0-a2 Added vars guest_counter and forum_data */ $vars = array('sql_ary', 'show_guests', 'guest_counter', 'forum_data'); extract($phpbb_dispatcher->trigger_event('core.viewonline_modify_sql', compact($vars))); @@ -385,7 +385,7 @@ while ($row = $db->sql_fetchrow($result)) * @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 + * @changed 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))); |