aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2016-07-17 11:06:50 +0200
committerMarc Alexander <admin@m-a-styles.de>2016-07-17 11:06:50 +0200
commitbe8bf42fe3a9130c8e62814d2b1788349ac2e063 (patch)
tree430c29fcdeb265b0cba97434aafffdf8cfbaf452 /phpBB
parent4e7705fcaf10180b793993f6e8154e7da3347114 (diff)
parentd0a5f87a44d4a73a740fd5242bcd11b059c7369b (diff)
downloadforums-be8bf42fe3a9130c8e62814d2b1788349ac2e063.tar
forums-be8bf42fe3a9130c8e62814d2b1788349ac2e063.tar.gz
forums-be8bf42fe3a9130c8e62814d2b1788349ac2e063.tar.bz2
forums-be8bf42fe3a9130c8e62814d2b1788349ac2e063.tar.xz
forums-be8bf42fe3a9130c8e62814d2b1788349ac2e063.zip
Merge branch '3.1.x' into 3.2.x
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/viewforum.php10
1 files changed, 7 insertions, 3 deletions
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index 9dc8e91f7a..812df396fa 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -942,11 +942,15 @@ if (sizeof($topic_list))
* Modify the topic data before it is assigned to the template
*
* @event core.viewforum_modify_topicrow
- * @var array row Array with topic data
- * @var array topic_row Template array with topic data
+ * @var array row Array with topic data
+ * @var array topic_row Template array with topic data
+ * @var bool s_type_switch Flag indicating if the topic type is [global] announcement
+ * @var bool s_type_switch_test Flag indicating if the test topic type is [global] announcement
* @since 3.1.0-a1
+ *
+ * @changed 3.1.10-RC1 Added s_type_switch, s_type_switch_test
*/
- $vars = array('row', 'topic_row');
+ $vars = array('row', 'topic_row', 's_type_switch', 's_type_switch_test');
extract($phpbb_dispatcher->trigger_event('core.viewforum_modify_topicrow', compact($vars)));
$template->assign_block_vars('topicrow', $topic_row);