diff options
| -rw-r--r-- | core/Version.php | 2 | ||||
| -rw-r--r-- | plugins/Installation/Controller.php | 37 | ||||
| m--------- | plugins/TreemapVisualization | 0 | ||||
| m--------- | tests/PHPUnit/UI | 0 |
4 files changed, 27 insertions, 12 deletions
diff --git a/core/Version.php b/core/Version.php index 5e0700e8f8..f5647ee59c 100644 --- a/core/Version.php +++ b/core/Version.php @@ -21,5 +21,5 @@ final class Version * The current Piwik version. * @var string */ - const VERSION = '2.2.1-rc1'; + const VERSION = '2.2.1-rc2'; } diff --git a/plugins/Installation/Controller.php b/plugins/Installation/Controller.php index abd291d4ae..fdf667019f 100644 --- a/plugins/Installation/Controller.php +++ b/plugins/Installation/Controller.php @@ -106,6 +106,8 @@ class Controller extends \Piwik\Plugin\ControllerAdmin { $this->checkPiwikIsNotInstalled(); + $this->deleteConfigFileIfNeeded(); + $view = new View( '@Installation/systemCheck', $this->getInstallationSteps(), @@ -154,7 +156,6 @@ class Controller extends \Piwik\Plugin\ControllerAdmin Db::get()->checkClientVersion(); - $this->deleteConfigFileIfNeeded(); $this->createConfigFile($dbInfos); $this->redirectToNextStep(__FUNCTION__); @@ -208,7 +209,10 @@ class Controller extends \Piwik\Plugin\ControllerAdmin DbHelper::createTables(); DbHelper::createAnonymousUser(); + $this->updateComponents(); + Updater::recordComponentSuccessfullyUpdated('core', Version::VERSION); + $view->tablesCreated = true; $view->showNextStep = true; } @@ -229,20 +233,13 @@ class Controller extends \Piwik\Plugin\ControllerAdmin 'tablesCreation' ); - Access::getInstance(); - Piwik::setUserHasSuperUserAccess(); - - $updater = new Updater(); - $componentsWithUpdateFile = CoreUpdater::getComponentUpdates($updater); - - if (empty($componentsWithUpdateFile)) { - return $this->redirectToNextStep('tablesCreation'); + $result = $this->updateComponents(); + if($result === false) { + $this->redirectToNextStep('tablesCreation'); } $oldVersion = Option::get('version_core'); - $result = CoreUpdater::updateComponents($updater, $componentsWithUpdateFile); - $view->coreError = $result['coreError']; $view->warningMessages = $result['warnings']; $view->errorMessages = $result['errors']; @@ -693,4 +690,22 @@ class Controller extends \Piwik\Plugin\ControllerAdmin } } + /** + * @return array|bool + */ + protected function updateComponents() + { + Access::getInstance(); + Piwik::setUserHasSuperUserAccess(); + + $updater = new Updater(); + $componentsWithUpdateFile = CoreUpdater::getComponentUpdates($updater); + + if (empty($componentsWithUpdateFile)) { + return false; + } + $result = CoreUpdater::updateComponents($updater, $componentsWithUpdateFile); + return $result; + } + } diff --git a/plugins/TreemapVisualization b/plugins/TreemapVisualization -Subproject 19978cb7cd926ec0fba111ce257b8f0450f34ce +Subproject 7f2b69cb86b41a5106575247fdbac5b9e077cb6 diff --git a/tests/PHPUnit/UI b/tests/PHPUnit/UI -Subproject 59f3899f8bae92fd50986cbeebddef5aee858e4 +Subproject 5a1919672bff960b034ac33a33ef4a968520739 |