diff options
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/pluginhost.php | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/classes/pluginhost.php b/classes/pluginhost.php index 13da7e7ab..7a21f8945 100644 --- a/classes/pluginhost.php +++ b/classes/pluginhost.php @@ -129,12 +129,10 @@ class PluginHost { } } function load_all($kind, $owner_uid = false) { - $plugins = array_map("basename", array_filter(glob("plugins/*"), "is_dir")); - if (is_dir("plugins.local")) { - $plugins = array_merge($plugins, array_map("basename", - array_filter(glob("plugins.local/*"), "is_dir"))); - } + $plugins = array_merge(glob("plugins/*"), glob("plugins.local/*")); + $plugins = array_filter($plugins, "is_dir"); + $plugins = array_map("basename", $plugins); asort($plugins); |