fix assets of loaded but not activated plugins are executed, make sure to remove Referers and PDFReports from plugin config

3 files changed, 42 insertions, 1 deletions

diff --git a/core/EventDispatcher.php b/core/EventDispatcher.php
index 670269862a..d0c2112255 100644
--- a/core/EventDispatcher.php
+++ b/core/EventDispatcher.php
@@ -66,7 +66,7 @@ class EventDispatcher extends Singleton
         }
 
         if (empty($plugins)) {
-            $plugins = \Piwik\Plugin\Manager::getInstance()->getLoadedPlugins();
+            $plugins = \Piwik\Plugin\Manager::getInstance()->getActivatedPlugins();
         }
 
         $callbacks = array();
diff --git a/core/Plugin/Manager.php b/core/Plugin/Manager.php
index 71d46afc33..2751d7c142 100644
--- a/core/Plugin/Manager.php
+++ b/core/Plugin/Manager.php
@@ -566,6 +566,21 @@ class Manager extends Singleton
     }
 
     /**
+     * Returns a list of all names of currently activated plugin eg,
+     *
+     *     array(
+     *         'UserCountry'
+     *         'UserSettings'
+     *     );
+     *
+     * @return string[]
+     */
+    public function getActivatedPlugins()
+    {
+        return $this->pluginsToLoad;
+    }
+
+    /**
      * Returns a Plugin object by name.
      *
      * @param string $name The name of the plugin, eg, `'Actions'`.
diff --git a/core/Updates/2.0-b10.php b/core/Updates/2.0-b10.php
new file mode 100644
index 0000000000..d307c6118a
--- /dev/null
+++ b/core/Updates/2.0-b10.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Piwik - Open source web analytics
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ * @category Piwik
+ * @package Piwik
+ */
+
+namespace Piwik\Updates;
+
+use Piwik\Updates;
+
+/**
+ * @package Updates
+ */
+class Updates_2_0_b10 extends Updates
+{
+    static function update()
+    {
+        parent::deletePluginFromConfigFile('Referers');
+        parent::deletePluginFromConfigFile('PDFReports');
+    }
+}