Fixes #4357 Merging branch into master, let's see if the build stays green

3 files changed, 16 insertions, 4 deletions

diff --git a/core/ArchiveProcessor/PluginsArchiver.php b/core/ArchiveProcessor/PluginsArchiver.php
index cfccad3583..56096079ea 100644
--- a/core/ArchiveProcessor/PluginsArchiver.php
+++ b/core/ArchiveProcessor/PluginsArchiver.php
@@ -121,7 +121,7 @@ class PluginsArchiver
     protected function getPluginArchivers()
     {
         if (empty(static::$archivers)) {
-            $pluginNames = \Piwik\Plugin\Manager::getInstance()->getActivatedPlugins();
+            $pluginNames = \Piwik\Plugin\Manager::getInstance()->getActivatedAndLoadedPlugins();
             $archivers = array();
             foreach ($pluginNames as $pluginName) {
                 $archivers[$pluginName] = self::getPluginArchiverClass($pluginName);
diff --git a/core/EventDispatcher.php b/core/EventDispatcher.php
index b884505177..ba6365d9f2 100644
--- a/core/EventDispatcher.php
+++ b/core/EventDispatcher.php
@@ -64,7 +64,7 @@ class EventDispatcher extends Singleton
         }
 
         if (empty($plugins)) {
-            $plugins = \Piwik\Plugin\Manager::getInstance()->getLoadedPlugins();
+            $plugins = \Piwik\Plugin\Manager::getInstance()->getActivatedAndLoadedPlugins();
         }
 
         $callbacks = array();
diff --git a/core/Plugin/Manager.php b/core/Plugin/Manager.php
index df7b3e7347..ed7a80297a 100644
--- a/core/Plugin/Manager.php
+++ b/core/Plugin/Manager.php
@@ -637,9 +637,21 @@ class Manager extends Singleton
      *
      * @return string[]
      */
-    public function getActivatedPlugins()
+    public function getActivatedAndLoadedPlugins()
     {
-        return $this->pluginsToLoad;
+        $activatedPlugins = $this->pluginsToLoad;
+
+        $plugins = array();
+        foreach ($activatedPlugins as $activatedPlugin) {
+
+            if ($activatedPlugin
+                && $this->isPluginLoaded($activatedPlugin)) {
+
+                $plugins[] = $activatedPlugin;
+            }
+        }
+
+        return $plugins;
     }
 
     /**