aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2015-08-09 10:15:02 +0200
committerMarc Alexander <admin@m-a-styles.de>2015-08-09 10:15:02 +0200
commit03c64d3384bd77f5bb43d45d6b1b70314bc651b8 (patch)
tree482d92581910554c7dbf93acd00b255b6e42a85d
parent7b8f8d7d907386a860bbef3f19dbe26953e128b0 (diff)
parent5f4943c183e334d517acb84711f3b1dee6918ded (diff)
downloadforums-03c64d3384bd77f5bb43d45d6b1b70314bc651b8.tar
forums-03c64d3384bd77f5bb43d45d6b1b70314bc651b8.tar.gz
forums-03c64d3384bd77f5bb43d45d6b1b70314bc651b8.tar.bz2
forums-03c64d3384bd77f5bb43d45d6b1b70314bc651b8.tar.xz
forums-03c64d3384bd77f5bb43d45d6b1b70314bc651b8.zip
Merge branch '3.1.x'
Conflicts: phpBB/includes/mcp/mcp_forum.php
-rw-r--r--phpBB/includes/mcp/mcp_forum.php24
1 files changed, 24 insertions, 0 deletions
diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php
index 06bbf1ce41..485c9d5eec 100644
--- a/phpBB/includes/mcp/mcp_forum.php
+++ b/phpBB/includes/mcp/mcp_forum.php
@@ -77,6 +77,30 @@ function mcp_forum_view($id, $mode, $action, $forum_info)
break;
}
+ /**
+ * Get some data in order to execute other actions.
+ *
+ * @event core.mcp_forum_view_before
+ * @var string action The action
+ * @var array forum_info Array with forum infos
+ * @var int start Start value
+ * @var array topic_id_list Array of topics ids
+ * @var array post_id_list Array of posts ids
+ * @var array source_topic_ids Array of source topics ids
+ * @var int to_topic_id Array of destination topics ids
+ * @since 3.1.6-RC1
+ */
+ $vars = array(
+ 'action',
+ 'forum_info',
+ 'start',
+ 'topic_id_list',
+ 'post_id_list',
+ 'source_topic_ids',
+ 'to_topic_id',
+ );
+ extract($phpbb_dispatcher->trigger_event('core.mcp_forum_view_before', compact($vars)));
+
/* @var $pagination \phpbb\pagination */
$pagination = $phpbb_container->get('pagination');