diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2017-06-25 11:05:40 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2017-06-25 11:05:40 +0200 |
| commit | 689ebd3bb64ad76652dc9b97ee4761356faa0a32 (patch) | |
| tree | 3649aca314a11f464ca05ffe5b0bfd1a89603a45 /phpBB | |
| parent | ea8334b693220c202a811b6c8ee1786c222d160e (diff) | |
| parent | 127f5a3ffad4c971973dc6a0691343d2e9f342a9 (diff) | |
| download | forums-689ebd3bb64ad76652dc9b97ee4761356faa0a32.tar forums-689ebd3bb64ad76652dc9b97ee4761356faa0a32.tar.gz forums-689ebd3bb64ad76652dc9b97ee4761356faa0a32.tar.bz2 forums-689ebd3bb64ad76652dc9b97ee4761356faa0a32.tar.xz forums-689ebd3bb64ad76652dc9b97ee4761356faa0a32.zip | |
Merge pull request #4855 from dsinn/ticket/15250
[ticket/15250] Add core event to MCP at the end of merge_posts
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 7dbe7787cb..d5415302c8 100644 --- a/phpBB/includes/mcp/mcp_topic.php +++ b/phpBB/includes/mcp/mcp_topic.php @@ -676,7 +676,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, $auth; + global $db, $template, $user, $phpEx, $phpbb_root_path, $auth, $phpbb_dispatcher; if (!$to_topic_id) { @@ -777,6 +777,20 @@ function merge_posts($topic_id, $to_topic_id) $redirect = request_var('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); } |