diff options
| author | Máté Bartus <mate.bartus@gmail.com> | 2017-09-09 12:07:52 +0200 |
|---|---|---|
| committer | Máté Bartus <mate.bartus@gmail.com> | 2017-09-09 12:07:52 +0200 |
| commit | c265eab081cce761d150cf4a641ead5483193ab7 (patch) | |
| tree | c9a1f46f3c1c3e54a21d0e6148da7ee6284b9b29 /phpBB/includes/functions.php | |
| parent | 16da17a4ba4b55404dba2b3416d8c62971ba16ca (diff) | |
| parent | c368d170cf09d06ff63249d4405323e6108d90bb (diff) | |
| download | forums-c265eab081cce761d150cf4a641ead5483193ab7.tar forums-c265eab081cce761d150cf4a641ead5483193ab7.tar.gz forums-c265eab081cce761d150cf4a641ead5483193ab7.tar.bz2 forums-c265eab081cce761d150cf4a641ead5483193ab7.tar.xz forums-c265eab081cce761d150cf4a641ead5483193ab7.zip | |
Merge pull request #4932 from Nicofuma/ticket/15351
[ticket/15351] Makes confirm_works in a router context (app.php)
Diffstat (limited to 'phpBB/includes/functions.php')
| -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 6c15c14300..6a36210dca 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -1839,7 +1839,7 @@ function redirect($url, $return = false, $disable_cd_check = false) /** * Re-Apply session id after page reloads */ -function reapply_sid($url) +function reapply_sid($url, $is_route = false) { global $phpEx, $phpbb_root_path; @@ -1861,7 +1861,7 @@ function reapply_sid($url) $url = preg_replace("/$phpEx(&|&)+?/", "$phpEx?", $url); } - return append_sid($url); + return append_sid($url, false, true, false, $is_route); } /** @@ -2184,7 +2184,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_page($use_page, $config['enable_mod_rewrite'])); + $u_action = reapply_sid($phpbb_path_helper->get_valid_page($use_page, $config['enable_mod_rewrite']), $phpbb_path_helper->is_router_used()); $u_action .= ((strpos($u_action, '?') === false) ? '?' : '&') . 'confirm_key=' . $confirm_key; $template->assign_vars(array( |