From ca5d39e8665dc6eaaeec3f53bddd338e07f9a038 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Fri, 5 Jun 2015 18:10:17 +0300
Subject: [PATCH] pluginhost: assume plugins.local exists
---
classes/pluginhost.php | 8 +++-----
1 file 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);
--
GitLab