From 7f59bbbf0de34a119eefc356ba09d41c03540091 Mon Sep 17 00:00:00 2001
From: mattab <matthieu.aubry@gmail.com>
Date: Mon, 14 Apr 2014 16:49:23 +1200
Subject: Revert previous commit, this was wrong. Instead use:
 getPluginsLoadedAndActivated() to load only activated plugins. refs #4357

---
 core/AssetManager.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'core/AssetManager.php')

diff --git a/core/AssetManager.php b/core/AssetManager.php
index 2b790c2166..972c84c37f 100644
--- a/core/AssetManager.php
+++ b/core/AssetManager.php
@@ -201,8 +201,9 @@ class AssetManager extends Singleton
     {
         $loadedPlugins = array();
 
-        foreach(Manager::getInstance()->getLoadedPluginsName() as $pluginName) {
+        foreach(Manager::getInstance()->getPluginsLoadedAndActivated() as $plugin) {
 
+            $pluginName = $plugin->getPluginName();
             $pluginIsCore = Manager::getInstance()->isPluginBundledWithCore($pluginName);
 
             if(($pluginIsCore && $core) || (!$pluginIsCore && !$core))
-- 
cgit v1.2.3