diff options
| author | Daniel Sinn <daniel.p.sinn@gmail.com> | 2016-09-30 15:58:10 -0400 |
|---|---|---|
| committer | Daniel Sinn <daniel.p.sinn@gmail.com> | 2016-09-30 15:58:10 -0400 |
| commit | c6383d3f89c79200253f7d82ebca39f1e3b0393c (patch) | |
| tree | 8d37ec551f65bff5a253a98f6c5bc02430c0082e /phpBB/includes/mcp/mcp_forum.php | |
| parent | 1d25c80a9c2aa654e99905c227bcbb9dede5d2f1 (diff) | |
| download | forums-c6383d3f89c79200253f7d82ebca39f1e3b0393c.tar forums-c6383d3f89c79200253f7d82ebca39f1e3b0393c.tar.gz forums-c6383d3f89c79200253f7d82ebca39f1e3b0393c.tar.bz2 forums-c6383d3f89c79200253f7d82ebca39f1e3b0393c.tar.xz forums-c6383d3f89c79200253f7d82ebca39f1e3b0393c.zip | |
[ticket/14804] Rename event to mcp_forum_merge_topics_after; update @since
PHPBB3-14804
Diffstat (limited to 'phpBB/includes/mcp/mcp_forum.php')
| -rw-r--r-- | phpBB/includes/mcp/mcp_forum.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php index b4f0c9e950..f887a6d5ea 100644 --- a/phpBB/includes/mcp/mcp_forum.php +++ b/phpBB/includes/mcp/mcp_forum.php @@ -506,16 +506,16 @@ function merge_topics($forum_id, $topic_ids, $to_topic_id) /** * Perform additional actions after merging topics. * - * @event core.mcp_merge_after + * @event core.mcp_forum_merge_topics_after * @var array all_topic_data The data from all topics involved in the merge * @var int to_topic_id The ID of the topic into which the rest are merged - * @since 3.1.10-RC1 + * @since 3.1.11-RC1 */ $vars = array( 'all_topic_data', 'to_topic_id', ); - extract($phpbb_dispatcher->trigger_event('core.mcp_merge_after', compact($vars))); + extract($phpbb_dispatcher->trigger_event('core.mcp_forum_merge_topics_after', compact($vars))); meta_refresh(3, $redirect); trigger_error($user->lang[$success_msg] . '<br /><br />' . $return_link); |