makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/12099] Correctly fix go back to root before prepending the root path

Browse source 
This allows moving app.php outside of phpBB and still work as expected

PHPBB3-12099
This commit is contained in:
Joas Schilling 2014-05-11 14:54:51 +02:00
parent 64f51bd3dd
commit 58cfdfe143
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
phpBB/phpbb/path_helper.php
View file

@ -184,9 +184,10 @@ class path_helper
* Append ../ to the end of the phpbb_root_path as many times * Append ../ to the end of the phpbb_root_path as many times
* as / exists in path_info * as / exists in path_info
*/ */
return $this->web_root_path = $this->phpbb_root_path . str_repeat('../', $corrections); $this->web_root_path = $this->filesystem->clean_path(str_repeat('../', $corrections) . $this->phpbb_root_path);
} }
else
{
/* /*
* If we're here it means we're at a re-written path, so we must * If we're here it means we're at a re-written path, so we must
* correct the relative path for web URLs. We must append ../ * correct the relative path for web URLs. We must append ../
@ -194,7 +195,10 @@ class path_helper
* less one time (because the script, e.g. /app.php, doesn't exist in * less one time (because the script, e.g. /app.php, doesn't exist in
* the URL) * the URL)
*/ */
return $this->web_root_path = $this->phpbb_root_path . str_repeat('../', $corrections - 1); $this->web_root_path = $this->filesystem->clean_path(str_repeat('../', $corrections - 1) . $this->phpbb_root_path);
}
return $this->web_root_path;
} }
/** /**