diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-10-21 22:38:03 -0500 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-10-21 22:38:03 -0500 |
| commit | a623868f20574e19d6840af11bce8836ad436e95 (patch) | |
| tree | 8014b89a762028cfdcee5e10779b0cbe896f89a3 /phpBB/includes | |
| parent | ce8c09f51f47b5e6806d51da643fba82d2341372 (diff) | |
| download | forums-a623868f20574e19d6840af11bce8836ad436e95.tar forums-a623868f20574e19d6840af11bce8836ad436e95.tar.gz forums-a623868f20574e19d6840af11bce8836ad436e95.tar.bz2 forums-a623868f20574e19d6840af11bce8836ad436e95.tar.xz forums-a623868f20574e19d6840af11bce8836ad436e95.zip | |
[ticket/13192] Pass correct parameters and rename method to get_valid_page
PHPBB3-13192
Diffstat (limited to 'phpBB/includes')
| -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 d11aadacfa..169c741ecf 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2396,7 +2396,7 @@ function build_url($strip_vars = false) { global $config, $user, $phpbb_path_helper; - $page = $phpbb_path_helper->get_valid_user_page($user->page['page'], $config['enable_mod_rewrite']); + $page = $phpbb_path_helper->get_valid_page($user->page['page'], $config['enable_mod_rewrite']); // Append SID $redirect = append_sid($page, false, false); @@ -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 $phpbb_path_helper, $phpbb_root_path; + global $config, $phpbb_path_helper; if (isset($_POST['cancel'])) { @@ -2701,7 +2701,7 @@ 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) ? $u_action : str_replace('&', '&', $user->page['page']); - $u_action = reapply_sid($phpbb_path_helper->get_valid_user_page($use_page)); + $u_action = reapply_sid($phpbb_path_helper->get_valid_page($use_page, $config['enable_mod_rewrite'])); $u_action .= ((strpos($u_action, '?') === false) ? '?' : '&') . 'confirm_key=' . $confirm_key; $template->assign_vars(array( |