aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-05-11 15:35:54 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-05-29 23:44:08 +0200
commit64f51bd3ddd362d25012edef9af692ddd1fd4fc7 (patch)
tree1db371fdf0278accd0d355479479ed2dcdce6900 /phpBB/phpbb
parentb378bd7a2e4aca8c607924ca6288227451d879e5 (diff)
downloadforums-64f51bd3ddd362d25012edef9af692ddd1fd4fc7.tar
forums-64f51bd3ddd362d25012edef9af692ddd1fd4fc7.tar.gz
forums-64f51bd3ddd362d25012edef9af692ddd1fd4fc7.tar.bz2
forums-64f51bd3ddd362d25012edef9af692ddd1fd4fc7.tar.xz
forums-64f51bd3ddd362d25012edef9af692ddd1fd4fc7.zip
[ticket/12099] Clean some paths before using them
PHPBB3-12099
Diffstat (limited to 'phpBB/phpbb')
-rw-r--r--phpBB/phpbb/path_helper.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/phpbb/path_helper.php b/phpBB/phpbb/path_helper.php
index 0d83e7447e..eb2cbf7313 100644
--- a/phpBB/phpbb/path_helper.php
+++ b/phpBB/phpbb/path_helper.php
@@ -98,7 +98,7 @@ class path_helper
{
$path = substr($path, strlen($this->phpbb_root_path));
- return $this->get_web_root_path() . $path;
+ return $this->filesystem->clean_path($this->get_web_root_path() . $path);
}
return $path;
@@ -158,7 +158,7 @@ class path_helper
*/
if ($path_info === '/' && preg_match('/app\.' . $this->php_ext . '\/$/', $request_uri))
{
- return $this->web_root_path = $this->phpbb_root_path . '../';
+ return $this->web_root_path = $this->filesystem->clean_path('../' . $this->phpbb_root_path);
}
/*