diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-10-21 22:17:48 -0500 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-10-21 22:17:48 -0500 |
| commit | ce8c09f51f47b5e6806d51da643fba82d2341372 (patch) | |
| tree | 756586b133ea5aa80784245ef6f75724e05289df | |
| parent | c381ad2002546042de5a71dedbea1a7d45d1e2d8 (diff) | |
| download | forums-ce8c09f51f47b5e6806d51da643fba82d2341372.tar forums-ce8c09f51f47b5e6806d51da643fba82d2341372.tar.gz forums-ce8c09f51f47b5e6806d51da643fba82d2341372.tar.bz2 forums-ce8c09f51f47b5e6806d51da643fba82d2341372.tar.xz forums-ce8c09f51f47b5e6806d51da643fba82d2341372.zip | |
[ticket/13192] Use get_valid_user_page in confirm_box() and cleanup globals
The $request global existed twice and the $phpEx global is not being used
in confirm_box().
PHPBB3-13192
| -rw-r--r-- | phpBB/includes/functions.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index d1d0f8f681..d11aadacfa 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2638,7 +2638,7 @@ function check_form_key($form_name, $timespan = false) function confirm_box($check, $title = '', $hidden = '', $html_body = 'confirm_body.html', $u_action = '') { global $user, $template, $db, $request; - global $phpEx, $phpbb_root_path, $request; + global $phpbb_path_helper, $phpbb_root_path; if (isset($_POST['cancel'])) { @@ -2700,8 +2700,8 @@ function confirm_box($check, $title = '', $hidden = '', $html_body = 'confirm_bo } // re-add sid / transform & to & for user->page (user->page is always using &) - $use_page = ($u_action) ? $phpbb_root_path . $u_action : $phpbb_root_path . str_replace('&', '&', $user->page['page']); - $u_action = reapply_sid($use_page); + $use_page = ($u_action) ? $u_action : str_replace('&', '&', $user->page['page']); + $u_action = reapply_sid($phpbb_path_helper->get_valid_user_page($use_page)); $u_action .= ((strpos($u_action, '?') === false) ? '?' : '&') . 'confirm_key=' . $confirm_key; $template->assign_vars(array( |