makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.2.x'

Browse source
This commit is contained in:
Tristan Darricau 2016-12-29 18:18:54 +01:00
commit b81aaee17f
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
phpBB/phpbb/di/proxy_instantiator.php
View file

@ -13,8 +13,6 @@
namespace phpbb\di; namespace phpbb\di;
use bantu\IniGetWrapper\IniGetWrapper;
use phpbb\filesystem\filesystem;
use ProxyManager\Configuration; use ProxyManager\Configuration;
use ProxyManager\Factory\LazyLoadingValueHolderFactory; use ProxyManager\Factory\LazyLoadingValueHolderFactory;
use ProxyManager\GeneratorStrategy\EvaluatingGeneratorStrategy; 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 // Prevent trying to write to system temp dir in case of open_basedir
// restrictions being in effect // restrictions being in effect
$ini_wrapper = new IniGetWrapper();
$filesystem = new filesystem();
$tmp_dir = (function_exists('sys_get_temp_dir')) ? sys_get_temp_dir() : ''; $tmp_dir = (function_exists('sys_get_temp_dir')) ? sys_get_temp_dir() : '';
if (empty($tmp_dir) || $ini_wrapper->getString('open_basedir') && if (empty($tmp_dir) || !@file_exists($tmp_dir) || !@is_writable($tmp_dir))
(!$filesystem->exists($tmp_dir) || !$filesystem->is_writable($tmp_dir)))
{ {
$config->setProxiesTargetDir($cache_dir); $config->setProxiesTargetDir($cache_dir);
} }