mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-06 23:55:26 +02:00
Code Issues Releases Wiki Activity

[ticket/9918] $redirect variable used from now

Browse Source 
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
This commit is contained in:
Senky 2012-04-09 16:23:42 +02:00
parent e57e82d478
commit e6a1d37634
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/includes/mcp/mcp_forum.php
View File

@ -433,7 +433,7 @@ function merge_topics($forum_id, $topic_ids, $to_topic_id)
confirm_box(false, 'MERGE_TOPICS', $s_hidden_fields); 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); $redirect = reapply_sid($redirect);
if (!$success_msg) if (!$success_msg)
@ -442,7 +442,7 @@ function merge_topics($forum_id, $topic_ids, $to_topic_id)
} }
else 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); trigger_error($user->lang[$success_msg] . '<br /><br />' . $return_link);
} }
} }

8
phpBB/includes/mcp/mcp_topic.php
View File

@ -529,7 +529,7 @@ function split_topic($action, $topic_id, $to_forum_id, $subject)
confirm_box(false, ($action == 'split_all') ? 'SPLIT_TOPIC_ALL' : 'SPLIT_TOPIC_BEYOND', $s_hidden_fields); confirm_box(false, ($action == 'split_all') ? 'SPLIT_TOPIC_ALL' : 'SPLIT_TOPIC_BEYOND', $s_hidden_fields);
} }
$redirect = request_var('redirect', "index.$phpEx"); $redirect = request_var('redirect', "{$phpbb_root_path}viewtopic.$phpEx", "f=$to_forum_id&amp;t=$to_topic_id");
$redirect = reapply_sid($redirect); $redirect = reapply_sid($redirect);
if (!$success_msg) if (!$success_msg)
@ -538,7 +538,7 @@ function split_topic($action, $topic_id, $to_forum_id, $subject)
} }
else else
{ {
meta_refresh(3, append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$to_forum_id&amp;t=$to_topic_id")); meta_refresh(3, $redirect);
trigger_error($user->lang[$success_msg] . '<br /><br />' . $return_link); trigger_error($user->lang[$success_msg] . '<br /><br />' . $return_link);
} }
} }
@ -635,7 +635,7 @@ function merge_posts($topic_id, $to_topic_id)
confirm_box(false, 'MERGE_POSTS', $s_hidden_fields); confirm_box(false, 'MERGE_POSTS', $s_hidden_fields);
} }
$redirect = request_var('redirect', "index.$phpEx"); $redirect = request_var('redirect', "{$phpbb_root_path}viewtopic.$phpEx", "f=$to_forum_id&amp;t=$to_topic_id");
$redirect = reapply_sid($redirect); $redirect = reapply_sid($redirect);
if (!$success_msg) if (!$success_msg)
@ -644,7 +644,7 @@ function merge_posts($topic_id, $to_topic_id)
} }
else else
{ {
meta_refresh(3, append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$to_forum_id&amp;t=$to_topic_id")); meta_refresh(3, $redirect);
trigger_error($user->lang[$success_msg] . '<br /><br />' . $return_link); trigger_error($user->lang[$success_msg] . '<br /><br />' . $return_link);
} }
} }