mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-05 16:27:38 +02:00
[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
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user