diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php
index 6df3320a97..d0d13aaf13 100644
--- a/phpBB/includes/mcp/mcp_forum.php
+++ b/phpBB/includes/mcp/mcp_forum.php
@@ -450,22 +450,14 @@ function merge_topics($forum_id, $topic_ids, $to_topic_id)
// Link to the new topic
$return_link .= (($return_link) ? '
' : '') . sprintf($user->lang['RETURN_NEW_TOPIC'], '', '');
+ $redirect = request_var('redirect', "{$phpbb_root_path}viewtopic.$phpEx?f=$to_forum_id&t=$to_topic_id");
+ $redirect = reapply_sid($redirect);
+
+ meta_refresh(3, $redirect);
+ trigger_error($user->lang[$success_msg] . '
' . $return_link);
}
else
{
confirm_box(false, 'MERGE_TOPICS', $s_hidden_fields);
}
-
- $redirect = request_var('redirect', "{$phpbb_root_path}viewtopic.$phpEx?f=$to_forum_id&t=$to_topic_id");
- $redirect = reapply_sid($redirect);
-
- if (!$success_msg)
- {
- return;
- }
- else
- {
- meta_refresh(3, $redirect);
- trigger_error($user->lang[$success_msg] . '
' . $return_link);
- }
}
diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php
index 9c294b96c8..a2aa03c583 100644
--- a/phpBB/includes/mcp/mcp_topic.php
+++ b/phpBB/includes/mcp/mcp_topic.php
@@ -568,24 +568,16 @@ function split_topic($action, $topic_id, $to_forum_id, $subject)
// Link back to both topics
$return_link = sprintf($user->lang['RETURN_TOPIC'], '', '') . '
' . sprintf($user->lang['RETURN_NEW_TOPIC'], '', '');
+ $redirect = request_var('redirect', "{$phpbb_root_path}viewtopic.$phpEx?f=$to_forum_id&t=$to_topic_id");
+ $redirect = reapply_sid($redirect);
+
+ meta_refresh(3, $redirect);
+ trigger_error($user->lang[$success_msg] . '
' . $return_link);
}
else
{
confirm_box(false, ($action == 'split_all') ? 'SPLIT_TOPIC_ALL' : 'SPLIT_TOPIC_BEYOND', $s_hidden_fields);
}
-
- $redirect = request_var('redirect', "{$phpbb_root_path}viewtopic.$phpEx?f=$to_forum_id&t=$to_topic_id");
- $redirect = reapply_sid($redirect);
-
- if (!$success_msg)
- {
- return;
- }
- else
- {
- meta_refresh(3, $redirect);
- trigger_error($user->lang[$success_msg] . '
' . $return_link);
- }
}
/**
@@ -677,22 +669,14 @@ function merge_posts($topic_id, $to_topic_id)
// Link to the new topic
$return_link .= (($return_link) ? '
' : '') . sprintf($user->lang['RETURN_NEW_TOPIC'], '', '');
+ $redirect = request_var('redirect', "{$phpbb_root_path}viewtopic.$phpEx?f=$to_forum_id&t=$to_topic_id");
+ $redirect = reapply_sid($redirect);
+
+ meta_refresh(3, $redirect);
+ trigger_error($user->lang[$success_msg] . '
' . $return_link);
}
else
{
confirm_box(false, 'MERGE_POSTS', $s_hidden_fields);
}
-
- $redirect = request_var('redirect', "{$phpbb_root_path}viewtopic.$phpEx?f=$to_forum_id&t=$to_topic_id");
- $redirect = reapply_sid($redirect);
-
- if (!$success_msg)
- {
- return;
- }
- else
- {
- meta_refresh(3, $redirect);
- trigger_error($user->lang[$success_msg] . '
' . $return_link);
- }
}