mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 16:56:44 +02:00
Code Issues Releases Wiki Activity

Merge pull request #4160 from Nicofuma/ticket/14440

Browse Source 
[ticket/14440] Correctly remove the web root path in update_web_root_path
This commit is contained in:
Marc Alexander
2016-02-11 23:40:18 +01:00
parent c9e5d308f2 5557760ecc
commit 971fe13a28
2 changed files with 45 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
phpBB/phpbb/path_helper.php
View File

@@ -100,11 +100,18 @@ class path_helper
*/
public function update_web_root_path($path)
{
$web_root_path = $this->get_web_root_path();
// Removes the web root path if it is already present
if (strpos($path, $web_root_path) === 0)
{
$path = $this->phpbb_root_path . substr($path, strlen($web_root_path));
}
if (strpos($path, $this->phpbb_root_path) === 0)
{
$path = substr($path, strlen($this->phpbb_root_path));
$web_root_path = $this->get_web_root_path();
if (substr($web_root_path, -8) === 'app.php/' && substr($path, 0, 7) === 'app.php')
{
$path = substr($path, 8);