From f7bab20a13a7bb6715070fec73a7ab455632f1a7 Mon Sep 17 00:00:00 2001
From: mattab <matthieu.aubry@gmail.com>
Date: Thu, 20 Feb 2014 19:21:16 +1300
Subject: [PATCH] Config can be tested last
---
plugins/Installation/Controller.php | 24 ++++++++++++------------
tests/PHPUnit/UI | 2 +-
2 files changed, 13 insertions(+), 13 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
index 1e1145feda..3edb7bd1fb 160000
--- a/tests/PHPUnit/UI
+++ b/tests/PHPUnit/UI
@@ -1 +1 @@
-Subproject commit 1e1145fedad4ce79b0039e8d51425d04882d29c7
+Subproject commit 3edb7bd1fb377946df55336532c7bb82f24ceb5e
--
GitLab