aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_display.php
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2017-02-11 15:21:00 +0100
committerMarc Alexander <admin@m-a-styles.de>2017-02-11 21:48:20 +0100
commitf27cdad73e7a4af913414522d85855136bf50b31 (patch)
tree33ce0eb4d82bdf011b6235b60daea812c3902982 /phpBB/includes/functions_display.php
parent59ad9401d9db8c6b6612f01f7b295f12c4cdccf7 (diff)
parent45199adebdfc00f436a719de1c5772429367b756 (diff)
downloadforums-f27cdad73e7a4af913414522d85855136bf50b31.tar
forums-f27cdad73e7a4af913414522d85855136bf50b31.tar.gz
forums-f27cdad73e7a4af913414522d85855136bf50b31.tar.bz2
forums-f27cdad73e7a4af913414522d85855136bf50b31.tar.xz
forums-f27cdad73e7a4af913414522d85855136bf50b31.zip
Merge branch '3.1.x' into 3.2.x
Diffstat (limited to 'phpBB/includes/functions_display.php')
-rw-r--r--phpBB/includes/functions_display.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 326378d815..c8b5ec8b1a 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -442,7 +442,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
* @var array root_data Array with the root forum data
* @var array row The data of the 'category'
* @since 3.1.0-RC4
- * @change 3.1.7-RC1 Removed undefined catless variable
+ * @changed 3.1.7-RC1 Removed undefined catless variable
*/
$vars = array(
'cat_row',
@@ -648,7 +648,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
* @var array row The data of the forum
* @var array subforums_row Template data of subforums
* @since 3.1.0-a1
- * @change 3.1.0-b5 Added var subforums_row
+ * @changed 3.1.0-b5 Added var subforums_row
*/
$vars = array('forum_row', 'row', 'subforums_row');
extract($phpbb_dispatcher->trigger_event('core.display_forums_modify_template_vars', compact($vars)));