diff options
| author | mattab <matthieu.aubry@gmail.com> | 2014-12-22 01:25:37 +0300 |
|---|---|---|
| committer | mattab <matthieu.aubry@gmail.com> | 2014-12-22 01:27:44 +0300 |
| commit | e9fdfd09efa8fca315bba07fd46d25e68854933f (patch) | |
| tree | e242688cd0a12722669401de1c4405cdefb8ee62 | |
| parent | 5ac0f38bcbf9be70a70adc4dec63f9c676ce9e23 (diff) | |
Fixes #6884 - simply fail when Piwik is already installed to prevent other issues
| -rw-r--r-- | plugins/Installation/Controller.php | 12 | ||||
| -rw-r--r-- | plugins/Installation/templates/welcome.twig | 10 |
2 files changed, 4 insertions, 18 deletions
diff --git a/plugins/Installation/Controller.php b/plugins/Installation/Controller.php index 9d6244a63c..bf6920dffc 100644 --- a/plugins/Installation/Controller.php +++ b/plugins/Installation/Controller.php @@ -78,26 +78,20 @@ 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) + function welcome() { // Delete merged js/css files to force regenerations based on updated activated plugin list Filesystem::deleteAllCacheOnUpdate(); - if (empty($message)) { - $this->checkPiwikIsNotInstalled(); - } + $this->checkPiwikIsNotInstalled(); $view = new View( '@Installation/welcome', $this->getInstallationSteps(), __FUNCTION__ ); - $view->newInstall = !SettingsPiwik::isPiwikInstalled(); - $view->errorMessage = $message; - $view->showNextStep = $view->newInstall; + $view->showNextStep = true; return $view->render(); } diff --git a/plugins/Installation/templates/welcome.twig b/plugins/Installation/templates/welcome.twig index 89df7ac8aa..e879b5319e 100644 --- a/plugins/Installation/templates/welcome.twig +++ b/plugins/Installation/templates/welcome.twig @@ -3,15 +3,7 @@ {% block content %} <h2>{{ 'Installation_Welcome'|translate }}</h2> -{% if newInstall %} - {{ 'Installation_WelcomeHelp'|translate(totalNumberOfSteps)|raw }} -{% else %} - <p>{{ 'Installation_ConfigurationHelp'|translate }}</p> - <br/> - <div class="error"> - {{ errorMessage }} - </div> -{% endif %} +{{ 'Installation_WelcomeHelp'|translate(totalNumberOfSteps)|raw }} <script type="text/javascript"> <!-- |