aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-12-27 13:38:25 +0100
committerJoas Schilling <nickvergessen@gmx.de>2014-12-27 13:38:25 +0100
commit3c41df2255d1f93380a9bd5668d787e94783c307 (patch)
tree1abe9982d2058eacd48e7972c87f1ae19e380aa2
parent00933ad2879e12a5853371f3b921c7918572bee1 (diff)
parent867a45138cb76aa42d2f350bf18751ecbfc29cc9 (diff)
downloadforums-3c41df2255d1f93380a9bd5668d787e94783c307.tar
forums-3c41df2255d1f93380a9bd5668d787e94783c307.tar.gz
forums-3c41df2255d1f93380a9bd5668d787e94783c307.tar.bz2
forums-3c41df2255d1f93380a9bd5668d787e94783c307.tar.xz
forums-3c41df2255d1f93380a9bd5668d787e94783c307.zip
Merge branch 'develop-ascraeus' into develop
-rw-r--r--phpBB/viewforum.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index 1f455494f7..ce079cb262 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -395,7 +395,7 @@ $sql_array = array(
* @var array forum_data Array with forum data
* @var array sql_array The SQL array to get the data of all topics
* @since 3.1.0-a1
-* @change 3.1.0-RC4 Added forum_data var
+* @change 3.1.0-RC4 Added forum_data var
*/
$vars = array(
'forum_data',
@@ -554,6 +554,7 @@ $sql_ary = array(
* Event to modify the SQL query before the topic ids data is retrieved
*
* @event core.viewforum_get_topic_ids_data
+* @var array forum_data Data about the forum
* @var array sql_ary SQL query array to get the topic ids data
* @var string sql_approved Topic visibility SQL string
* @var int sql_limit Number of records to select
@@ -564,8 +565,11 @@ $sql_ary = array(
* @var bool store_reverse Flag indicating if we select from the late pages
*
* @since 3.1.0-RC4
+*
+* @changed 3.1.3 Added forum_data
*/
$vars = array(
+ 'forum_data',
'sql_ary',
'sql_approved',
'sql_limit',