diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-10-10 15:12:55 -0500 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-10-10 15:12:55 -0500 |
| commit | dba5188f23d0c8ac00ed309003fb3251c204a33c (patch) | |
| tree | 2c0536aedcf880afb804e503ddb5928a89834adc /phpBB/phpbb/path_helper.php | |
| parent | b59131f558a6d0fe4c836e2658152c8698f0cd22 (diff) | |
| download | forums-dba5188f23d0c8ac00ed309003fb3251c204a33c.tar forums-dba5188f23d0c8ac00ed309003fb3251c204a33c.tar.gz forums-dba5188f23d0c8ac00ed309003fb3251c204a33c.tar.bz2 forums-dba5188f23d0c8ac00ed309003fb3251c204a33c.tar.xz forums-dba5188f23d0c8ac00ed309003fb3251c204a33c.zip | |
[ticket/11874] Do not always prepend the web path; only replace phpbb_root_path
PHPBB3-11874
Diffstat (limited to 'phpBB/phpbb/path_helper.php')
| -rw-r--r-- | phpBB/phpbb/path_helper.php | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/phpBB/phpbb/path_helper.php b/phpBB/phpbb/path_helper.php index b2ed11a927..e9fd092b62 100644 --- a/phpBB/phpbb/path_helper.php +++ b/phpBB/phpbb/path_helper.php @@ -89,26 +89,24 @@ class path_helper } /** - * Update a path to the correct relative root path + * Update a web path to the correct relative root path * * This replaces $phpbb_root_path . some_url with - * get_web_root_path() . some_url OR if $phpbb_root_path - * is not at the beginning of $path, just prepends the - * web root path + * get_web_root_path() . some_url * * @param string $path The path to be updated * @return string */ public function update_web_root_path($path) { - $web_root_path = $this->get_web_root_path($this->symfony_request); - if (strpos($path, $this->phpbb_root_path) === 0) { $path = substr($path, strlen($this->phpbb_root_path)); + + return $this->get_web_root_path() . $path; } - return $web_root_path . $path; + return $path; } /** |