diff options
| author | Senky <jakubsenko@gmail.com> | 2012-04-09 16:23:42 +0200 |
|---|---|---|
| committer | Senky <jakubsenko@gmail.com> | 2012-04-09 16:23:42 +0200 |
| commit | e6a1d37634fb9f9f53125460abdaf9c90d8858a7 (patch) | |
| tree | 920a183f65e138ed6b1d498a01ef38cfcde97d53 /phpBB/includes/mcp/mcp_forum.php | |
| parent | e57e82d478feccc3a995b71118663e7f65c02ea7 (diff) | |
| download | forums-e6a1d37634fb9f9f53125460abdaf9c90d8858a7.tar forums-e6a1d37634fb9f9f53125460abdaf9c90d8858a7.tar.gz forums-e6a1d37634fb9f9f53125460abdaf9c90d8858a7.tar.bz2 forums-e6a1d37634fb9f9f53125460abdaf9c90d8858a7.tar.xz forums-e6a1d37634fb9f9f53125460abdaf9c90d8858a7.zip | |
[ticket/9918] $redirect variable used from now
According to comment marc1706 added to tracker
http://tracker.phpbb.com/browse/PHPBB3-9918?focusedCommentId=35120&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-35120
I changed files to fit his second advice - redirect is kept in hidden_fields and other code changed.
PHPBB3-9918
Diffstat (limited to 'phpBB/includes/mcp/mcp_forum.php')
| -rw-r--r-- | phpBB/includes/mcp/mcp_forum.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php index fec1edc872..889e0a368c 100644 --- a/phpBB/includes/mcp/mcp_forum.php +++ b/phpBB/includes/mcp/mcp_forum.php @@ -433,7 +433,7 @@ function merge_topics($forum_id, $topic_ids, $to_topic_id) confirm_box(false, 'MERGE_TOPICS', $s_hidden_fields); } - $redirect = request_var('redirect', "index.$phpEx"); + $redirect = request_var('redirect', "{$phpbb_root_path}viewtopic.$phpEx", "f=$to_forum_id&t=$to_topic_id"); $redirect = reapply_sid($redirect); if (!$success_msg) @@ -442,7 +442,7 @@ function merge_topics($forum_id, $topic_ids, $to_topic_id) } else { - meta_refresh(3, append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$to_forum_id&t=$to_topic_id")); + meta_refresh(3, $redirect); trigger_error($user->lang[$success_msg] . '<br /><br />' . $return_link); } } |