refs #4357 make sure plugin name is set

matomo-org · Dec 4, 2013 · 034742a · 034742a
1 parent 71f1845
commit 034742a
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/core/Plugin/Manager.php b/core/Plugin/Manager.php
@@ -578,11 +578,13 @@ public function getLoadedPlugins()
     public function getActivatedAndLoadedPlugins()
     {
         $activatedPlugins = $this->pluginsToLoad;
-        $loadedPlugins    = $this->loadedPlugins;
 
         $plugins = array();
         foreach ($activatedPlugins as $activatedPlugin) {
-            if (array_key_exists($activatedPlugin, $loadedPlugins)) {
+
+            if ($activatedPlugin
+                && $this->isPluginLoaded($activatedPlugin)) {
+
                 $plugins[] = $activatedPlugin;
             }
         }