diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-09-09 18:19:50 -0500 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-09-09 18:19:50 -0500 |
| commit | 6692db892f538d3a72f1dbd06af9a94f24a9da9a (patch) | |
| tree | fd1a66455dacec409519617b9754125a08fe2467 /phpBB/includes | |
| parent | f30b87519e9ead41525e1979cbce874e8a84e2b8 (diff) | |
| download | forums-6692db892f538d3a72f1dbd06af9a94f24a9da9a.tar forums-6692db892f538d3a72f1dbd06af9a94f24a9da9a.tar.gz forums-6692db892f538d3a72f1dbd06af9a94f24a9da9a.tar.bz2 forums-6692db892f538d3a72f1dbd06af9a94f24a9da9a.tar.xz forums-6692db892f538d3a72f1dbd06af9a94f24a9da9a.zip | |
[ticket/11832] update_web_root_path helper and tests
PHPBB3-11832
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions.php | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 844609e4e3..124c0de169 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2419,12 +2419,9 @@ function append_sid($url, $params = false, $is_amp = true, $session_id = false) $params = false; } + // Update the root path with the correct relative web path $phpbb_filesystem = $phpbb_container->get('filesystem'); - $corrected_path = $phpbb_filesystem->get_web_root_path($symfony_request); - if ($corrected_path) - { - $url = substr($corrected_path . $url, strlen($phpbb_root_path)); - } + $url = $phpbb_filesystem->update_web_root_path($url, $symfony_request); $append_sid_overwrite = false; |