From 583f163f40852c8067708a0a69e38e9c27318179 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@madoka.volgo-balt.ru>
Date: Thu, 8 Oct 2015 17:02:32 +0300
Subject: don't init plugins when loading everything to make a list, duh

---
 classes/pluginhost.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'classes/pluginhost.php')

diff --git a/classes/pluginhost.php b/classes/pluginhost.php
index 75620a191..0f3d8f37c 100644
--- a/classes/pluginhost.php
+++ b/classes/pluginhost.php
@@ -133,7 +133,7 @@ class PluginHost {
 			return array();
 		}
 	}
-	function load_all($kind, $owner_uid = false) {
+	function load_all($kind, $owner_uid = false, $skip_init = false) {
 
 		$plugins = array_merge(glob("plugins/*"), glob("plugins.local/*"));
 		$plugins = array_filter($plugins, "is_dir");
@@ -141,10 +141,10 @@ class PluginHost {
 
 		asort($plugins);
 
-		$this->load(join(",", $plugins), $kind, $owner_uid);
+		$this->load(join(",", $plugins), $kind, $owner_uid, $skip_init);
 	}
 
-	function load($classlist, $kind, $owner_uid = false) {
+	function load($classlist, $kind, $owner_uid = false, $skip_init = false) {
 		$plugins = explode(",", $classlist);
 
 		$this->owner_uid = (int) $owner_uid;
@@ -181,18 +181,18 @@ class PluginHost {
 					switch ($kind) {
 					case $this::KIND_SYSTEM:
 						if ($this->is_system($plugin)) {
-							$plugin->init($this);
+							if (!$skip_init) $plugin->init($this);
 							$this->register_plugin($class, $plugin);
 						}
 						break;
 					case $this::KIND_USER:
 						if (!$this->is_system($plugin)) {
-							$plugin->init($this);
+							if (!$skip_init) $plugin->init($this);
 							$this->register_plugin($class, $plugin);
 						}
 						break;
 					case $this::KIND_ALL:
-						$plugin->init($this);
+						if (!$skip_init) $plugin->init($this);
 						$this->register_plugin($class, $plugin);
 						break;
 					}
-- 
cgit v1.2.3-54-g00ecf