Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/Installation/Controller.php')
-rw-r--r--plugins/Installation/Controller.php7
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(),