diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-05-08 13:02:01 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-08 13:02:01 +0200 |
| commit | aade62b0a3d7a593f91dbdd04f8264dd541efa7f (patch) | |
| tree | 2cceb53230d327c23cecd915e7237a4a24daf282 | |
| parent | 0c3c77c6bfd2648c1b9d2cc9c80363155f5be0c5 (diff) | |
| parent | eddb4203757366eef2afc81d53d948d3aaeed0c7 (diff) | |
| download | forums-aade62b0a3d7a593f91dbdd04f8264dd541efa7f.tar forums-aade62b0a3d7a593f91dbdd04f8264dd541efa7f.tar.gz forums-aade62b0a3d7a593f91dbdd04f8264dd541efa7f.tar.bz2 forums-aade62b0a3d7a593f91dbdd04f8264dd541efa7f.tar.xz forums-aade62b0a3d7a593f91dbdd04f8264dd541efa7f.zip | |
Merge pull request #2419 from prototech/ticket/12510
[ticket/12510] Convert & to & in build_url() when no params are stripped.
* prototech/ticket/12510:
[ticket/12510] Convert & to & in build_url() when no params are stripped.
| -rw-r--r-- | phpBB/includes/functions.php | 4 | ||||
| -rw-r--r-- | tests/functions/build_url_test.php | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 3480a338c0..a0e2a46f54 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2356,6 +2356,10 @@ function build_url($strip_vars = false) { $redirect = $phpbb_path_helper->strip_url_params($redirect, $strip_vars, false); } + else + { + $redirect = str_replace('&', '&', $redirect); + } return $redirect . ((strpos($redirect, '?') === false) ? '?' : ''); } diff --git a/tests/functions/build_url_test.php b/tests/functions/build_url_test.php index 795427ffe8..ad36f29b8c 100644 --- a/tests/functions/build_url_test.php +++ b/tests/functions/build_url_test.php @@ -45,6 +45,11 @@ class phpbb_build_url_test extends phpbb_test_case 'phpBB/index.php?', ), array( + 'viewtopic.php?t=5&f=4', + false, + 'phpBB/viewtopic.php?t=5&f=4', + ), + array( 'viewtopic.php?f=2&style=1&t=6', 'f', 'phpBB/viewtopic.php?style=1&t=6', |