diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-12-09 11:32:13 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-12-09 11:32:13 +0100 |
| commit | 90b59bb547844f6913cb459c21d249aec4226d56 (patch) | |
| tree | 4274d0d8437fa6b534c93ebc2a8c3bcd37f5d657 | |
| parent | 6a568719d031544553a9e236e4128c5bfbd42600 (diff) | |
| download | forums-90b59bb547844f6913cb459c21d249aec4226d56.tar forums-90b59bb547844f6913cb459c21d249aec4226d56.tar.gz forums-90b59bb547844f6913cb459c21d249aec4226d56.tar.bz2 forums-90b59bb547844f6913cb459c21d249aec4226d56.tar.xz forums-90b59bb547844f6913cb459c21d249aec4226d56.zip | |
[ticket/14891] Don't rely on sys_get_temp_dir() being available
Or actually returning a path. It might also return an empty string
or null.
PHPBB3-14891
| -rw-r--r-- | phpBB/phpbb/di/proxy_instantiator.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/phpbb/di/proxy_instantiator.php b/phpBB/phpbb/di/proxy_instantiator.php index 47cc7b69c4..a388e82c0e 100644 --- a/phpBB/phpbb/di/proxy_instantiator.php +++ b/phpBB/phpbb/di/proxy_instantiator.php @@ -47,8 +47,8 @@ class proxy_instantiator implements InstantiatorInterface // restrictions being in effect $ini_wrapper = new IniGetWrapper(); $filesystem = new filesystem(); - $tmp_dir = sys_get_temp_dir(); - if ($ini_wrapper->getString('open_basedir') && + $tmp_dir = (function_exists('sys_get_temp_dir')) ? sys_get_temp_dir() : ''; + if (empty($tmp_dir) || $ini_wrapper->getString('open_basedir') && (!$filesystem->exists($tmp_dir) || !$filesystem->is_writable($tmp_dir))) { $config->setProxiesTargetDir($cache_dir); |