diff options
| author | mattab <matthieu.aubry@gmail.com> | 2014-04-14 08:49:23 +0400 |
|---|---|---|
| committer | mattab <matthieu.aubry@gmail.com> | 2014-04-14 08:49:23 +0400 |
| commit | 7f59bbbf0de34a119eefc356ba09d41c03540091 (patch) | |
| tree | 6332c0ece396fbfc5512efb1cf1f35ed5312acb6 /core/AssetManager.php | |
| parent | ce5abb89334f31d85994e0dda0807e2427e57b78 (diff) | |
Revert previous commit, this was wrong. Instead use: getPluginsLoadedAndActivated() to load only activated plugins. refs #4357
Diffstat (limited to 'core/AssetManager.php')
| -rw-r--r-- | core/AssetManager.php | 3 |
1 files changed, 2 insertions, 1 deletions
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)) |