diff options
author | Andrew Dolgov <[email protected]> | 2015-06-05 18:10:17 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2015-06-05 18:10:17 +0300 |
commit | ca5d39e8665dc6eaaeec3f53bddd338e07f9a038 (patch) | |
tree | 7a4a5ec079e95e986c514b63447196e6ac7eeead | |
parent | b9634eb8b8cab7329dca8d8173ce381a8c1f81f4 (diff) |
pluginhost: assume plugins.local exists
-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); |