Making "Theme Enable" work for PleineLune

core/PluginsManager.php

@@ -282,13 +282,21 @@ class PluginsManager
             return;
         }
 
+        // Only one theme enabled at a time
+        $themeAlreadyEnabled = $this->getThemeEnabled();
+        if($themeAlreadyEnabled) {
+            $plugin = $this->loadPlugin($pluginName);
+            if($plugin->isTheme()) {
+                $plugins = $this->deactivatePlugin( $themeAlreadyEnabled, $plugins );
+            }
+        }
+
+        // Load plugin
         $plugin = $this->loadPlugin($pluginName);
         if ($plugin === null) {
             return;
         }
-
         $this->installPluginIfNecessary($plugin);
-
         $plugin->activate();
 
         // we add the plugin to the list of activated plugins
@@ -297,12 +305,6 @@ class PluginsManager
         }
         $plugins = array_unique($plugins);
 
-        // Only one theme enabled at a time
-        $themeAlreadyEnabled = $this->getThemeEnabled();
-        if($plugin->isTheme()
-            && $themeAlreadyEnabled) {
-            $plugins = $this->deactivatePlugin( $themeAlreadyEnabled, $plugins );
-        }
 
         // the config file will automatically be saved with the new plugin
         $this->updatePluginsConfig($plugins);

plugins/PleineLune/plugin.piwik.json

 {
     "name": "PleineLune",
-    "description": "A dark theme for Piwik, ideal to view your analytics reports before sunrise!",
+    "description": "A dark theme for Piwik, ideal to view your analytics reports before sunrise.",
     "theme": true
 }
\ No newline at end of file