Merge pull request #6658 from piwik/tmp-path

Moved the `tmp/` path into the config (was hardcoded everywhere)

1 files changed, 19 insertions, 0 deletions

diff --git a/config/global.php b/config/global.php
index 9a25907242..7dc6daa18f 100644
--- a/config/global.php
+++ b/config/global.php
@@ -1,4 +1,23 @@
 <?php
 
+use Interop\Container\ContainerInterface;
+
 return array(
+
+    'path.root' => PIWIK_USER_PATH,
+
+    'path.tmp' => DI\factory(function (ContainerInterface $c) {
+        $root = $c->get('path.root');
+
+        // TODO remove that special case and instead have plugins override 'path.tmp' to add the instance id
+        if ($c->has('old_config.General.instance_id')) {
+            $instanceId = $c->get('old_config.General.instance_id');
+            $instanceId = $instanceId ? '/' . $instanceId : '';
+        } else {
+            $instanceId = '';
+        }
+
+        return $root . '/tmp' . $instanceId;
+    }),
+
 );