diff options
author | mattab <matthieu.aubry@gmail.com> | 2014-02-20 10:21:16 +0400 |
---|---|---|
committer | mattab <matthieu.aubry@gmail.com> | 2014-02-20 10:21:16 +0400 |
commit | f7bab20a13a7bb6715070fec73a7ab455632f1a7 (patch) | |
tree | db8eb18f3faaadf074cf6288874201b3029dc48e | |
parent | 2ce3ca4de743c079c581720a2b6b45ea12b266df (diff) |
Config can be tested last2.1-rc6
-rw-r--r-- | plugins/Installation/Controller.php | 24 | ||||
m--------- | tests/PHPUnit/UI | 0 |
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 |