diff options
| author | Cesar G <prototech91@gmail.com> | 2013-11-21 04:37:37 -0800 |
|---|---|---|
| committer | Cesar G <prototech91@gmail.com> | 2013-11-21 04:45:16 -0800 |
| commit | 6d45146df7e7b19d6286f09370950fda207e309e (patch) | |
| tree | e836fff6d38a18d751c407c8b583f06662335b3a | |
| parent | bc33fd9950e6aad4abed3f22f44e2590f1749eab (diff) | |
| download | forums-6d45146df7e7b19d6286f09370950fda207e309e.tar forums-6d45146df7e7b19d6286f09370950fda207e309e.tar.gz forums-6d45146df7e7b19d6286f09370950fda207e309e.tar.bz2 forums-6d45146df7e7b19d6286f09370950fda207e309e.tar.xz forums-6d45146df7e7b19d6286f09370950fda207e309e.zip | |
[ticket/11672] Move the reapply_sid() call before meta_refresh() is called.
The $redirect assignment is not necessary because the variable has already been
set near the start of the functions. The redirect value will also never default
to index.php because a default value has already been provided when $redirect
is initially assigned and passed to the template as a hidden field.
PHPBB3-11672
| -rw-r--r-- | phpBB/includes/mcp/mcp_main.php | 8 | ||||
| -rw-r--r-- | phpBB/includes/mcp/mcp_queue.php | 9 |
2 files changed, 6 insertions, 11 deletions
diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php index 5491af0859..d9197da07e 100644 --- a/phpBB/includes/mcp/mcp_main.php +++ b/phpBB/includes/mcp/mcp_main.php @@ -256,6 +256,7 @@ function lock_unlock($action, $ids) unset($orig_ids); $redirect = request_var('redirect', build_url(array('action', 'quickmod'))); + $redirect = reapply_sid($redirect); $s_hidden_fields = build_hidden_fields(array( $sql_id . '_list' => $ids, @@ -294,8 +295,6 @@ function lock_unlock($action, $ids) confirm_box(false, strtoupper($action) . '_' . $l_prefix . ((sizeof($ids) == 1) ? '' : 'S'), $s_hidden_fields); } - $redirect = request_var('redirect', "index.$phpEx"); - $redirect = reapply_sid($redirect); redirect($redirect); } @@ -341,6 +340,7 @@ function change_topic_type($action, $topic_ids) } $redirect = request_var('redirect', build_url(array('action', 'quickmod'))); + $redirect = reapply_sid($redirect); $s_hidden_fields = array( 'topic_id_list' => $topic_ids, @@ -387,7 +387,7 @@ function change_topic_type($action, $topic_ids) if (!$request->is_ajax()) { - $message .= $user->lang('RETURN_PAGE', '<a href="' . $redirect . '">', '</a>'); + $message .= '<br /><br />' . $user->lang('RETURN_PAGE', '<a href="' . $redirect . '">', '</a>'); } trigger_error($message); } @@ -396,8 +396,6 @@ function change_topic_type($action, $topic_ids) confirm_box(false, $l_new_type, build_hidden_fields($s_hidden_fields)); } - $redirect = request_var('redirect', "index.$phpEx"); - $redirect = reapply_sid($redirect); redirect($redirect); } diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php index 3b5e3752f8..0318bc5e15 100644 --- a/phpBB/includes/mcp/mcp_queue.php +++ b/phpBB/includes/mcp/mcp_queue.php @@ -576,6 +576,7 @@ class mcp_queue } $redirect = $request->variable('redirect', build_url(array('quickmod'))); + $redirect = reapply_sid($redirect); $success_msg = $post_url = ''; $approve_log = array(); @@ -729,8 +730,6 @@ class mcp_queue confirm_box(false, strtoupper($action) . '_POST' . ((sizeof($post_id_list) == 1) ? '' : 'S'), $s_hidden_fields, 'mcp_approve.html'); } - $redirect = $request->variable('redirect', "index.$phpEx"); - $redirect = reapply_sid($redirect); redirect($redirect); } @@ -754,6 +753,7 @@ class mcp_queue } $redirect = $request->variable('redirect', build_url(array('quickmod'))); + $redirect = reapply_sid($redirect); $success_msg = $topic_url = ''; $approve_log = array(); @@ -869,8 +869,6 @@ class mcp_queue confirm_box(false, strtoupper($action) . '_TOPIC' . ((sizeof($topic_id_list) == 1) ? '' : 'S'), $s_hidden_fields, 'mcp_approve.html'); } - $redirect = $request->variable('redirect', "index.$phpEx"); - $redirect = reapply_sid($redirect); redirect($redirect); } @@ -893,6 +891,7 @@ class mcp_queue } $redirect = $request->variable('redirect', build_url(array('t', 'mode', 'quickmod')) . "&mode=$mode"); + $redirect = reapply_sid($redirect); $reason = $request->variable('reason', '', true); $reason_id = $request->variable('reason_id', 0); $success_msg = $additional_msg = ''; @@ -1199,8 +1198,6 @@ class mcp_queue confirm_box(false, $l_confirm_msg, $s_hidden_fields, $confirm_template); } - $redirect = $request->variable('redirect', "index.$phpEx"); - $redirect = reapply_sid($redirect); redirect($redirect); } } |