aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/common.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2013-04-17 17:52:00 +0200
committerJoas Schilling <nickvergessen@gmx.de>2013-04-17 17:53:44 +0200
commitd7fb934a2f6fbce86563d692b9689eb5c76e31dd (patch)
tree2b5c5c1e98d8d68fc529d528a60dc58d9cfd6305 /phpBB/common.php
parent158bce02095b1fbff19955cbad19be3d1b1a3f80 (diff)
downloadforums-d7fb934a2f6fbce86563d692b9689eb5c76e31dd.tar
forums-d7fb934a2f6fbce86563d692b9689eb5c76e31dd.tar.gz
forums-d7fb934a2f6fbce86563d692b9689eb5c76e31dd.tar.bz2
forums-d7fb934a2f6fbce86563d692b9689eb5c76e31dd.tar.xz
forums-d7fb934a2f6fbce86563d692b9689eb5c76e31dd.zip
[ticket/11362] Replace other calls to phpbb_clean_path
Need to instantiate the object manually here, as the container is not yet set up. PHPBB3-11362
Diffstat (limited to 'phpBB/common.php')
-rw-r--r--phpBB/common.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/phpBB/common.php b/phpBB/common.php
index c33e2cbb1f..6dd65739fc 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -44,8 +44,11 @@ if (!defined('PHPBB_INSTALLED'))
// Replace any number of consecutive backslashes and/or slashes with a single slash
// (could happen on some proxy setups and/or Windows servers)
$script_path = preg_replace('#[\\\\/]{2,}#', '/', $script_path);
+
// Eliminate . and .. from the path
- $script_path = phpbb_clean_path($script_path);
+ require($phpbb_root_path . 'includes/filesystem.' . $phpEx);
+ $phpbb_filesystem = new phpbb_filesystem();
+ $script_path = $phpbb_filesystem->clean_path($script_path);
$url = (($secure) ? 'https://' : 'http://') . $server_name;