Fixes #5115 Fixes couple issues in the logic which should finally sol…

…ve reported issues.
matomo-org · May 9, 2014 · f27c691 · f27c691
1 parent aa810b6
commit f27c691
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 17 deletions.
diff --git a/core/Plugin/Manager.php b/core/Plugin/Manager.php
@@ -235,6 +235,8 @@ private function updatePluginsInstalledConfig($plugins)
     public function clearPluginsInstalledConfig()
     {
         $this->updatePluginsInstalledConfig( array() );
+        PiwikConfig::getInstance()->forceSave();
+        PiwikConfig::getInstance()->init();
     }
 
     /**

diff --git a/core/Updater.php b/core/Updater.php
@@ -252,26 +252,21 @@ public function getComponentsWithNewVersion()
                     throw $e;
                 }
             }
-            if ($currentVersion === false) {
-                if ($name === 'core') {
-                    // This should not happen
-                    $currentVersion = Version::VERSION;
-                } else {
-                    // When plugins have been installed since Piwik 2.0 this should not happen
-                    // We "fix" the data for any plugin that may have been ported from Piwik 1.x
-                    $currentVersion = $version;
-                }
+
+            if ($name === 'core' && $currentVersion === false) {
+                // This should not happen
+                $currentVersion = Version::VERSION;
                 self::recordComponentSuccessfullyUpdated($name, $currentVersion);
             }
 
-            $versionCompare = version_compare($currentVersion, $version);
-            if ($versionCompare == -1) {
+            // note: when versionCompare == 1, the version in the DB is newer, we choose to ignore
+            $currentVersionIsOutdated = version_compare($currentVersion, $version) == -1;
+            $isComponentOutdated = $currentVersion === false || $currentVersionIsOutdated;
+            if ($isComponentOutdated) {
                 $componentsToUpdate[$name] = array(
                     self::INDEX_CURRENT_VERSION => $currentVersion,
                     self::INDEX_NEW_VERSION     => $version
                 );
-            } else if ($versionCompare == 1) {
-                // the version in the DB is newest.. we choose to ignore
             }
         }
         return $componentsToUpdate;

diff --git a/plugins/CoreUpdater/CoreUpdater.php b/plugins/CoreUpdater/CoreUpdater.php
@@ -111,13 +111,17 @@ public static function updateComponents(Updater $updater, $componentsWithUpdateF
     public static function getComponentUpdates(Updater $updater)
     {
         $updater->addComponentToCheck('core', Version::VERSION);
-        $plugins = \Piwik\Plugin\Manager::getInstance()->getLoadedPlugins();
+        $manager = \Piwik\Plugin\Manager::getInstance();
+        $plugins = $manager->getLoadedPlugins();
         foreach ($plugins as $pluginName => $plugin) {
-            $updater->addComponentToCheck($pluginName, $plugin->getVersion());
+            if($manager->isPluginInstalled($pluginName)) {
+                $updater->addComponentToCheck($pluginName, $plugin->getVersion());
+            }
         }
 
         $componentsWithUpdateFile = $updater->getComponentsWithUpdateFile();
-        if (count($componentsWithUpdateFile) == 0 && !$updater->hasNewVersion('core')) {
+        if (count($componentsWithUpdateFile) == 0
+            && !$updater->hasNewVersion('core')) {
             return null;
         }
 

diff --git a/plugins/Installation/Controller.php b/plugins/Installation/Controller.php
@@ -182,6 +182,7 @@ function tablesCreation()
         );
 
         if ($this->getParam('deleteTables')) {
+            Manager::getInstance()->clearPluginsInstalledConfig();
             Db::dropAllTables();
             $view->existingTablesDeleted = true;
         }
@@ -205,7 +206,6 @@ function tablesCreation()
             }
         } else {
 
-            Manager::getInstance()->clearPluginsInstalledConfig();
             DbHelper::createTables();
             DbHelper::createAnonymousUser();