mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-26 13:18:54 +00:00
[ticket/12787] Remove one app.php when it's both in $path and $web_root_path
PHPBB3-12787
This commit is contained in:
parent
bc47e719b1
commit
7399f29df8
1 changed files with 7 additions and 1 deletions
|
@ -104,7 +104,13 @@ class path_helper
|
||||||
{
|
{
|
||||||
$path = substr($path, strlen($this->phpbb_root_path));
|
$path = substr($path, strlen($this->phpbb_root_path));
|
||||||
|
|
||||||
return $this->filesystem->clean_path($this->get_web_root_path() . $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);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this->filesystem->clean_path($web_root_path . $path);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $path;
|
return $path;
|
||||||
|
|
Loading…
Add table
Reference in a new issue