aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2017-01-04 21:47:21 +0100
committerMarc Alexander <admin@m-a-styles.de>2017-01-04 21:47:21 +0100
commita0abb1e10e34c560c82e0d729f4b9a4620e8005c (patch)
tree6149fba2aec6ea3582f4d01de604acd89387c1a7
parent2f6993fa81d6dc04354e06dc31671491c9821116 (diff)
parent40bc4ac484223f78902e7275085a53ebc5e05dba (diff)
downloadforums-a0abb1e10e34c560c82e0d729f4b9a4620e8005c.tar
forums-a0abb1e10e34c560c82e0d729f4b9a4620e8005c.tar.gz
forums-a0abb1e10e34c560c82e0d729f4b9a4620e8005c.tar.bz2
forums-a0abb1e10e34c560c82e0d729f4b9a4620e8005c.tar.xz
forums-a0abb1e10e34c560c82e0d729f4b9a4620e8005c.zip
Merge pull request #4600 from hubaishan/ticket/14549
[ticket/14549] fix mcp page redirect back after topic merge and rised warning
-rw-r--r--phpBB/includes/mcp/mcp_forum.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php
index e4c0640ec7..3deb58b96a 100644
--- a/phpBB/includes/mcp/mcp_forum.php
+++ b/phpBB/includes/mcp/mcp_forum.php
@@ -458,7 +458,7 @@ function merge_topics($forum_id, $topic_ids, $to_topic_id)
return;
}
- $redirect = request_var('redirect', build_url(array('quickmod')));
+ $redirect = request_var('redirect', "{$phpbb_root_path}mcp.$phpEx?f=$forum_id&amp;i=main&amp;mode=forum_view");
$s_hidden_fields = build_hidden_fields(array(
'i' => 'main',