aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2018-01-06 10:53:12 +0100
committerMarc Alexander <admin@m-a-styles.de>2018-01-06 10:53:12 +0100
commite31474542dac500c76ed67d2b80f90a38da149d1 (patch)
tree12bf290a8ab7aaea8e4cc7195855949ecb5b72a6 /phpBB/includes
parent39b142077478876b4c2ef270c081681070f264d7 (diff)
downloadforums-e31474542dac500c76ed67d2b80f90a38da149d1.tar
forums-e31474542dac500c76ed67d2b80f90a38da149d1.tar.gz
forums-e31474542dac500c76ed67d2b80f90a38da149d1.tar.bz2
forums-e31474542dac500c76ed67d2b80f90a38da149d1.tar.xz
forums-e31474542dac500c76ed67d2b80f90a38da149d1.zip
[ticket/15498] Do not pass whether URL uses router to is_route
is_route expects a flag of whether this is a route that was generated with the router as opposed to is_router_used() which returns whether the router will be used via app.php. PHPBB3-15498
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/functions.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 2cd62d7bac..97e1e8e340 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -2185,7 +2185,7 @@ function confirm_box($check, $title = '', $hidden = '', $html_body = 'confirm_bo
// re-add sid / transform & to &amp; for user->page (user->page is always using &)
$use_page = ($u_action) ? $u_action : str_replace('&', '&amp;', $user->page['page']);
- $u_action = reapply_sid($phpbb_path_helper->get_valid_page($use_page, $config['enable_mod_rewrite']), $phpbb_path_helper->is_router_used());
+ $u_action = reapply_sid($phpbb_path_helper->get_valid_page($use_page, $config['enable_mod_rewrite']));
$u_action .= ((strpos($u_action, '?') === false) ? '?' : '&amp;') . 'confirm_key=' . $confirm_key;
$template->assign_vars(array(