[ticket/16207] Stop appending ? to build_url URLs if not needed

PHPBB3-16207
This commit is contained in:
Marc Alexander 2021-07-18 09:55:08 +02:00
parent 0cbbb79283
commit dd8191404d
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 5 additions and 5 deletions

View file

@ -1835,7 +1835,7 @@ function build_url($strip_vars = false)
$redirect = str_replace('&', '&', $redirect);
}
return $redirect . ((strpos($redirect, '?') === false) ? '?' : '');
return $redirect;
}
/**

View file

@ -39,12 +39,12 @@ class phpbb_build_url_test extends phpbb_test_case
array(
'index.php',
false,
'phpBB/index.php?',
'phpBB/index.php',
),
array(
'index.php',
't',
'phpBB/index.php?',
'phpBB/index.php',
),
array(
'viewtopic.php?t=5&f=4',
@ -59,12 +59,12 @@ class phpbb_build_url_test extends phpbb_test_case
array(
'viewtopic.php?f=2&style=1&t=6',
array('f', 'style', 't'),
'phpBB/viewtopic.php?',
'phpBB/viewtopic.php',
),
array(
'http://test.phpbb.com/viewtopic.php?f=2&style=1&t=6',
array('f', 'style', 't'),
'http://test.phpbb.com/viewtopic.php?',
'http://test.phpbb.com/viewtopic.php',
),
array(
'posting.php?f=2&mode=delete&p=20%22%3Cscript%3Ealert%281%29%3B%3C%2Fscript%3E',