makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 12:28:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.1.x' into 3.2.x

Browse source
This commit is contained in:
Marc Alexander 2017-01-04 21:50:25 +01:00
commit cfa2bc534b
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/mcp/mcp_forum.php
View file

@ -466,7 +466,7 @@ function merge_topics($forum_id, $topic_ids, $to_topic_id)
return; 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( $s_hidden_fields = build_hidden_fields(array(
'i' => 'main', 'i' => 'main',