diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2017-06-25 11:06:47 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2017-06-25 11:06:47 +0200 |
| commit | b28dc339f069ce142ea7ed60e0c0852560f73794 (patch) | |
| tree | 73058879ade8c10daa204388e3122502e22d777d /phpBB | |
| parent | 774c79c631b4356d000910cd25041cd10dd9ce2c (diff) | |
| parent | 689ebd3bb64ad76652dc9b97ee4761356faa0a32 (diff) | |
| download | forums-b28dc339f069ce142ea7ed60e0c0852560f73794.tar forums-b28dc339f069ce142ea7ed60e0c0852560f73794.tar.gz forums-b28dc339f069ce142ea7ed60e0c0852560f73794.tar.bz2 forums-b28dc339f069ce142ea7ed60e0c0852560f73794.tar.xz forums-b28dc339f069ce142ea7ed60e0c0852560f73794.zip | |
Merge branch '3.1.x' into 3.2.x
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/mcp/mcp_topic.php | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php index f02b23a70f..76df5b3a5e 100644 --- a/phpBB/includes/mcp/mcp_topic.php +++ b/phpBB/includes/mcp/mcp_topic.php @@ -678,7 +678,7 @@ function split_topic($action, $topic_id, $to_forum_id, $subject) */ function merge_posts($topic_id, $to_topic_id) { - global $db, $template, $user, $phpEx, $phpbb_root_path, $phpbb_log, $request; + global $db, $template, $user, $phpEx, $phpbb_root_path, $phpbb_log, $request, $phpbb_dispatcher; if (!$to_topic_id) { @@ -784,6 +784,20 @@ function merge_posts($topic_id, $to_topic_id) $redirect = $request->variable('redirect', "{$phpbb_root_path}viewtopic.$phpEx?f=$to_forum_id&t=$to_topic_id"); $redirect = reapply_sid($redirect); + /** + * Perform additional actions after merging posts. + * + * @event core.mcp_topics_merge_posts_after + * @var int topic_id The topic ID from which posts are being moved + * @var int to_topic_id The topic ID to which posts are being moved + * @since 3.1.11-RC1 + */ + $vars = array( + 'topic_id', + 'to_topic_id', + ); + extract($phpbb_dispatcher->trigger_event('core.mcp_topics_merge_posts_after', compact($vars))); + meta_refresh(3, $redirect); trigger_error($user->lang[$success_msg] . '<br /><br />' . $return_link); } |