Config can be tested last2.1-rc6

2 files changed, 12 insertions, 12 deletions

diff --git a/plugins/Installation/Controller.php b/plugins/Installation/Controller.php
index 47b244dfa8..d427a3ec85 100644
--- a/plugins/Installation/Controller.php
+++ b/plugins/Installation/Controller.php
@@ -756,24 +756,24 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
 
         $infos['general_infos'] = array();
 
-        $directoriesToCheck = array();
+
+
+        $directoriesToCheck = array(
+                                '/tmp/',
+                                '/tmp/assets/',
+                                '/tmp/cache/',
+                                '/tmp/latest/',
+                                '/tmp/logs/',
+                                '/tmp/sessions/',
+                                '/tmp/tcpdf/',
+                                '/tmp/templates_c/',
+        );
 
         if (!DbHelper::isInstalled()) {
             // at install, need /config to be writable (so we can create config.ini.php)
             $directoriesToCheck[] = '/config/';
         }
 
-        $directoriesToCheck = array_merge($directoriesToCheck, array(
-                                                                    '/tmp/',
-                                                                    '/tmp/assets/',
-                                                                    '/tmp/cache/',
-                                                                    '/tmp/latest/',
-                                                                    '/tmp/logs/',
-                                                                    '/tmp/sessions/',
-                                                                    '/tmp/tcpdf/',
-                                                                    '/tmp/templates_c/',
-                                                               ));
-
         $infos['directories'] = Filechecks::checkDirectoriesWritable($directoriesToCheck);
 
         $infos['can_auto_update'] = Filechecks::canAutoUpdate();
diff --git a/tests/PHPUnit/UI b/tests/PHPUnit/UI
-Subproject 1e1145fedad4ce79b0039e8d51425d04882d29c
+Subproject 3edb7bd1fb377946df55336532c7bb82f24ceb5