diff options
| author | Stefan Giehl <stefan@piwik.org> | 2017-12-19 23:42:07 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-19 23:42:07 +0300 |
| commit | 16a112e7af104a797f1683f9c3e9badc02b12341 (patch) | |
| tree | 0087ff3d8c6d626561f5831ad475e007532b6db7 /config | |
| parent | dc3aa786acee5ce025f1ae861347898b66018206 (diff) | |
fix/improve handling of tmp directory (#12365)
Diffstat (limited to 'config')
| -rw-r--r-- | config/global.php | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/config/global.php b/config/global.php index f7ac26c544..912bfc39f5 100644 --- a/config/global.php +++ b/config/global.php @@ -20,9 +20,12 @@ return array( } else { $instanceId = ''; } - - $tmp = Config::getInstance()->General['tmp_path']; - + + /** @var Piwik\Config\ $config */ + $config = $c->get('Piwik\Config'); + $general = $config->General; + $tmp = empty($general['tmp_path']) ? '/tmp' : $general['tmp_path']; + return $root . $tmp . $instanceId; }, |