Fix bug when a plugin is deactivated within the Tracker process.

It used to set the Plugins[] array to PluginsTracker[] since it was using pluginsToLoad
(and in Tracker only tracking plugins are loaded)

core/Plugin/Manager.php

@@ -179,10 +179,10 @@ class Manager extends Singleton
      *
      * @param array $plugins Plugins
      */
-    private function updatePluginsConfig()
+    private function updatePluginsConfig($pluginsToLoad)
     {
         $section = PiwikConfig::getInstance()->Plugins;
-        $section['Plugins'] = $this->pluginsToLoad;
+        $section['Plugins'] = $pluginsToLoad;
         PiwikConfig::getInstance()->Plugins = $section;
     }
 
@@ -394,7 +394,7 @@ class Manager extends Singleton
 
         $this->pluginsToLoad[] = $pluginName;
 
-        $this->updatePluginsConfig();
+        $this->updatePluginsConfig($this->pluginsToLoad);
         PiwikConfig::getInstance()->forceSave();
 
         $this->clearCache($pluginName);
@@ -1075,6 +1075,19 @@ class Manager extends Singleton
         $this->updatePluginsInstalledConfig($pluginsInstalled);
     }
 
+    /**
+     * @param $pluginName
+     */
+    private function removePluginFromPluginsConfig($pluginName)
+    {
+        $pluginsEnabled = PiwikConfig::getInstance()->Plugins['Plugins'];
+        $key = array_search($pluginName, $pluginsEnabled);
+        if ($key !== false) {
+            unset($pluginsEnabled[$key]);
+        }
+        $this->updatePluginsConfig($pluginsEnabled);
+    }
+
     private function removePluginFromTrackerConfig($pluginName)
     {
         $pluginsTracker = PiwikConfig::getInstance()->Plugins_Tracker['Plugins_Tracker'];
@@ -1166,7 +1179,7 @@ class Manager extends Singleton
      */
     private function removePluginFromConfig($pluginName)
     {
-        $this->updatePluginsConfig();
+        $this->removePluginFromPluginsConfig($pluginName);
         $this->removePluginFromTrackerConfig($pluginName);
         PiwikConfig::getInstance()->forceSave();
     }

core/Version.php

@@ -21,5 +21,5 @@ final class Version
      * The current Piwik version.
      * @var string
      */
-    const VERSION = '2.2.0-b18';
+    const VERSION = '2.2.0-b19';
 }

UI @ 7097a433

-Subproject commit 9d2267f0b3c88a98a8e780d79c170cd6803fab80
+Subproject commit 7097a433d7fdd363adfba18971a16d738287b972