diff --git a/core/Plugin/Manager.php b/core/Plugin/Manager.php index b8f135dc544009898218b9290a226084df5ba920..808b76231859c3b71fa0b423e7d6f5870b0f0302 100644 --- a/core/Plugin/Manager.php +++ b/core/Plugin/Manager.php @@ -232,6 +232,11 @@ class Manager extends Singleton PiwikConfig::getInstance()->PluginsInstalled = $section; } + public function clearPluginsInstalledConfig() + { + $this->updatePluginsInstalledConfig( array() ); + } + /** * Returns true if plugin is always activated * @@ -371,6 +376,7 @@ class Manager extends Singleton /** * Install loaded plugins * + * @throws * @return array Error messages of plugin install fails */ public function installLoadedPlugins() diff --git a/plugins/Installation/Controller.php b/plugins/Installation/Controller.php index 244b2595a3a4d7f2c9c0412443ce253d901b944c..dc015c52592f51d8da3d23dd1cd37e689877d66e 100644 --- a/plugins/Installation/Controller.php +++ b/plugins/Installation/Controller.php @@ -23,6 +23,7 @@ use Piwik\Filesystem; use Piwik\Http; use Piwik\Option; use Piwik\Piwik; +use Piwik\Plugin\Manager; use Piwik\Plugins\CoreUpdater\CoreUpdater; use Piwik\Plugins\LanguagesManager\LanguagesManager; use Piwik\Plugins\SitesManager\API as APISitesManager; @@ -309,6 +310,8 @@ class Controller extends \Piwik\Plugin\ControllerAdmin $this->session->skipThisStep = $tmp; } } else { + + Manager::getInstance()->clearPluginsInstalledConfig(); DbHelper::createTables(); DbHelper::createAnonymousUser(); diff --git a/tests/PHPUnit/UI b/tests/PHPUnit/UI index b8f1631c9657fa4573e3637d1fd65ed262f3cc71..3666b7053577b468530eea5fb820fe90d6092c02 160000 --- a/tests/PHPUnit/UI +++ b/tests/PHPUnit/UI @@ -1 +1 @@ -Subproject commit b8f1631c9657fa4573e3637d1fd65ed262f3cc71 +Subproject commit 3666b7053577b468530eea5fb820fe90d6092c02