diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2017-01-04 21:50:25 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2017-01-04 21:50:25 +0100 |
| commit | cfa2bc534b403fee05ac7e5188ba346313feb45f (patch) | |
| tree | 420ee0843b5afd3ca27f9906ff03e2952f307df9 | |
| parent | 24b02ad4d60c24642559ae8d212bd3d42a5efd0f (diff) | |
| parent | a0abb1e10e34c560c82e0d729f4b9a4620e8005c (diff) | |
| download | forums-cfa2bc534b403fee05ac7e5188ba346313feb45f.tar forums-cfa2bc534b403fee05ac7e5188ba346313feb45f.tar.gz forums-cfa2bc534b403fee05ac7e5188ba346313feb45f.tar.bz2 forums-cfa2bc534b403fee05ac7e5188ba346313feb45f.tar.xz forums-cfa2bc534b403fee05ac7e5188ba346313feb45f.zip | |
Merge branch '3.1.x' into 3.2.x
| -rw-r--r-- | phpBB/includes/mcp/mcp_forum.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php index c8e1e46209..3e214797c8 100644 --- a/phpBB/includes/mcp/mcp_forum.php +++ b/phpBB/includes/mcp/mcp_forum.php @@ -466,7 +466,7 @@ function merge_topics($forum_id, $topic_ids, $to_topic_id) return; } - $redirect = $request->variable('redirect', build_url(array('quickmod'))); + $redirect = $request->variable('redirect', "{$phpbb_root_path}mcp.$phpEx?f=$forum_id&i=main&mode=forum_view"); $s_hidden_fields = build_hidden_fields(array( 'i' => 'main', |