From b3cac10bf7a267f211d0b4ac5c5dafe88d6803c6 Mon Sep 17 00:00:00 2001
From: mattab <matthieu.aubry@gmail.com>
Date: Mon, 5 May 2014 15:27:18 +1200
Subject: Fixing UI tests?

---
 plugins/Installation/Controller.php | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'plugins/Installation/Controller.php')

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(),
-- 
cgit v1.2.3