diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-12-25 22:19:03 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-12-25 23:01:28 +0100 |
| commit | 97b834c3ef6051f11b0f74e60fe445976fb7d681 (patch) | |
| tree | 0e952612638e30e637f078bd871af7109d88a414 /phpBB/phpbb | |
| parent | c6aa4a319dd2cfb76a5919fc295ab782529c6646 (diff) | |
| download | forums-97b834c3ef6051f11b0f74e60fe445976fb7d681.tar forums-97b834c3ef6051f11b0f74e60fe445976fb7d681.tar.gz forums-97b834c3ef6051f11b0f74e60fe445976fb7d681.tar.bz2 forums-97b834c3ef6051f11b0f74e60fe445976fb7d681.tar.xz forums-97b834c3ef6051f11b0f74e60fe445976fb7d681.zip | |
[ticket/14934] Do not rely on open basedir being properly set
PHPBB3-14934
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/di/proxy_instantiator.php | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/phpBB/phpbb/di/proxy_instantiator.php b/phpBB/phpbb/di/proxy_instantiator.php index f8ef39535b..70295a3dec 100644 --- a/phpBB/phpbb/di/proxy_instantiator.php +++ b/phpBB/phpbb/di/proxy_instantiator.php @@ -13,8 +13,6 @@ namespace phpbb\di; -use bantu\IniGetWrapper\IniGetWrapper; -use phpbb\filesystem\filesystem; use ProxyManager\Configuration; use ProxyManager\Factory\LazyLoadingValueHolderFactory; use ProxyManager\GeneratorStrategy\EvaluatingGeneratorStrategy; @@ -45,11 +43,8 @@ class proxy_instantiator implements InstantiatorInterface // Prevent trying to write to system temp dir in case of open_basedir // restrictions being in effect - $ini_wrapper = new IniGetWrapper(); - $filesystem = new filesystem(); $tmp_dir = (function_exists('sys_get_temp_dir')) ? sys_get_temp_dir() : ''; - if (empty($tmp_dir) || $ini_wrapper->getString('open_basedir') && - (!@file_exists($tmp_dir) || !@is_writable($tmp_dir))) + if (empty($tmp_dir) || !@file_exists($tmp_dir) || !@is_writable($tmp_dir)) { $config->setProxiesTargetDir($cache_dir); } |