From d2a421e3cbaa782748840fc19afad4ac65f044b8 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Tue, 25 Dec 2012 10:02:08 +0400
Subject: more work on user-selectable plugins; properly process system and
 user plugins

---
 include/rssfuncs.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'include/rssfuncs.php')

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 2105de330..d3286a538 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -263,7 +263,14 @@
 
 		if (!$rss->error()) {
 
-			global $pluginhost;
+			// We use local pluginhost here because we need to load different per-user feed plugins
+			$user_plugins = get_pref($link, "_ENABLED_PLUGINS", $owner_uid);
+
+			$pluginhost = new PluginHost($link);
+
+			$pluginhost->load(PLUGINS, $pluginhost::KIND_ALL);
+			$pluginhost->load($plugins, $pluginhost::KIND_USER);
+
 			$pluginhost->run_hooks($pluginhost::HOOK_FEED_PARSED, "hook_feed_parsed", $rss);
 
 			if ($debug_enabled) {
@@ -538,7 +545,6 @@
 					"tags" => $entry_tags,
 					"author" => $entry_author);
 
-				global $pluginhost;
 				foreach ($pluginhost->get_hooks($pluginhost::HOOK_ARTICLE_FILTER) as $plugin) {
 					$article = $plugin->hook_article_filter($article);
 				}
-- 
cgit v1.2.3