makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-09 04:48:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/11874] Do not always prepend the web path; only replace phpbb_root_path

Browse source 
PHPBB3-11874
This commit is contained in:
Nathan Guse 2013-10-10 15:12:55 -05:00
parent b59131f558
commit dba5188f23
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
phpBB/phpbb/path_helper.php
View file

@ -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 * This replaces $phpbb_root_path . some_url with
* get_web_root_path() . some_url OR if $phpbb_root_path * get_web_root_path() . some_url
* is not at the beginning of $path, just prepends the
* web root path
* *
* @param string $path The path to be updated * @param string $path The path to be updated
* @return string * @return string
*/ */
public function update_web_root_path($path) 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) if (strpos($path, $this->phpbb_root_path) === 0)
{ {
$path = substr($path, strlen($this->phpbb_root_path)); $path = substr($path, strlen($this->phpbb_root_path));
return $this->get_web_root_path() . $path;
} }
return $web_root_path . $path; return $path;
} }
/** /**