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:
authorMatthieu Napoli <matthieu@mnapoli.fr>2014-11-04 02:32:32 +0300
committerMatthieu Napoli <matthieu@mnapoli.fr>2014-11-04 02:32:32 +0300
commitd02f6010775c5267a840423332537b3a33fd86d9 (patch)
treeab51b8529c46e09a90cffa94c7494915f8cf1483 /plugins/Installation/Controller.php
parentce6803a329f76fcde432f026cbe16290765c84ed (diff)
Prevent access to the last step of the installation if Piwik is already installed
The last step is now also not optional, you need to visit the page to mark installation as finished
Diffstat (limited to 'plugins/Installation/Controller.php')
-rw-r--r--plugins/Installation/Controller.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/Installation/Controller.php b/plugins/Installation/Controller.php
index 32f649ac46..a3c858f08c 100644
--- a/plugins/Installation/Controller.php
+++ b/plugins/Installation/Controller.php
@@ -363,8 +363,6 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
{
$this->checkPiwikIsNotInstalled();
- $this->markInstallationAsCompleted();
-
$view = new View(
'@Installation/trackingCode',
$this->getInstallationSteps(),
@@ -396,6 +394,8 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
*/
public function finished()
{
+ $this->checkPiwikIsNotInstalled();
+
$this->markInstallationAsCompleted();
$view = new View(