Merge pull request #6684 from piwik/installation_fix

Fix installation when privacy form submitted

plugins/Installation/Controller.php

@@ -396,8 +396,6 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
     {
         $this->checkPiwikIsNotInstalled();
 
-        $this->markInstallationAsCompleted();
-
         $view = new View(
             '@Installation/finished',
             $this->getInstallationSteps(),
@@ -424,6 +422,8 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
                  */
                 Piwik::postEvent('Installation.defaultSettingsForm.submit', array($form));
 
+                $this->markInstallationAsCompleted();
+
                 Url::redirectToUrl('index.php');
             } catch (Exception $e) {
                 $view->errorMessage = $e->getMessage();