diff options
| author | Cesar G <prototech91@gmail.com> | 2013-10-08 11:17:02 -0700 |
|---|---|---|
| committer | Cesar G <prototech91@gmail.com> | 2013-10-08 14:24:57 -0700 |
| commit | 6a75edc057270f081c4eb85763771e689770d510 (patch) | |
| tree | ccd1f5072c9c349719dd809f1a111c09c3fddbf3 /phpBB/includes/mcp/mcp_forum.php | |
| parent | 967bef365688508d2e587b228c1bfdd31a227f37 (diff) | |
| download | forums-6a75edc057270f081c4eb85763771e689770d510.tar forums-6a75edc057270f081c4eb85763771e689770d510.tar.gz forums-6a75edc057270f081c4eb85763771e689770d510.tar.bz2 forums-6a75edc057270f081c4eb85763771e689770d510.tar.xz forums-6a75edc057270f081c4eb85763771e689770d510.zip | |
[ticket/11892] Fix undefined variables: to_forum_id & to_topic_id
PHPBB3-11892
Diffstat (limited to 'phpBB/includes/mcp/mcp_forum.php')
| -rw-r--r-- | phpBB/includes/mcp/mcp_forum.php | 18 |
1 files changed, 5 insertions, 13 deletions
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) ? '<br /><br />' : '') . sprintf($user->lang['RETURN_NEW_TOPIC'], '<a href="' . append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $to_forum_id . '&t=' . $to_topic_id) . '">', '</a>'); - } - 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); + $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; + meta_refresh(3, $redirect); + trigger_error($user->lang[$success_msg] . '<br /><br />' . $return_link); } else { - meta_refresh(3, $redirect); - trigger_error($user->lang[$success_msg] . '<br /><br />' . $return_link); + confirm_box(false, 'MERGE_TOPICS', $s_hidden_fields); } } |