diff options
author | mattab <matthieu.aubry@gmail.com> | 2014-05-05 07:27:18 +0400 |
---|---|---|
committer | mattab <matthieu.aubry@gmail.com> | 2014-05-05 07:27:18 +0400 |
commit | b3cac10bf7a267f211d0b4ac5c5dafe88d6803c6 (patch) | |
tree | 63116bdf2b3093ac03cc88b73608a7483ca18a49 /plugins/Installation/Controller.php | |
parent | 517d0a914e37bbb174919619ed3db5ffbed442d0 (diff) |
Fixing UI tests?
Diffstat (limited to 'plugins/Installation/Controller.php')
-rw-r--r-- | plugins/Installation/Controller.php | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/plugins/Installation/Controller.php b/plugins/Installation/Controller.php index 7cb903efff..abd291d4ae 100644 --- a/plugins/Installation/Controller.php +++ b/plugins/Installation/Controller.php @@ -74,12 +74,19 @@ class Controller extends \Piwik\Plugin\ControllerAdmin /** * Installation Step 1: Welcome + * + * Can also display an error message when there is a failure early (eg. DB connection failed) + * + * @param string Optional error message */ function welcome($message = false) { // Delete merged js/css files to force regenerations based on updated activated plugin list Filesystem::deleteAllCacheOnUpdate(); + if(empty($message)) { + $this->checkPiwikIsNotInstalled(); + } $view = new View( '@Installation/welcome', $this->getInstallationSteps(), |