From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Sat, 23 Feb 2013 14:40:48 +0000 (+0400)
Subject: rssfuncs: load pluginhost stuff properly
X-Git-Tag: 1.7.1~51
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=ab457a9c96fee3d7f08272c97efd01a7c0e5171e;p=tt-rss.git

rssfuncs: load pluginhost stuff properly
---

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index af9a8b65..a1ddbb74 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -248,6 +248,11 @@
 		}
 
 		$pluginhost = new PluginHost($link);
+		$user_plugins = get_pref($link, "_ENABLED_PLUGINS", $owner_uid);
+
+		$pluginhost->load(PLUGINS, $pluginhost::KIND_ALL);
+		$pluginhost->load($user_plugins, $pluginhost::KIND_USER, $owner_uid);
+		$pluginhost->load_data();
 
 		foreach ($pluginhost->get_hooks($pluginhost::HOOK_FEED_FETCHED) as $plugin) {
 			$feed_data = $plugin->hook_feed_fetched($feed_data);
@@ -282,12 +287,6 @@
 		if (!$rss->error()) {
 
 			// 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->load(PLUGINS, $pluginhost::KIND_ALL);
-			$pluginhost->load($user_plugins, $pluginhost::KIND_USER, $owner_uid);
-			$pluginhost->load_data();
-
 			$pluginhost->run_hooks($pluginhost::HOOK_FEED_PARSED, "hook_feed_parsed", $rss);
 
 			if ($debug_enabled) {