diff options
author | MatthieuS <[email protected]> | 2018-05-23 09:00:04 +0000 |
---|---|---|
committer | MatthieuS <[email protected]> | 2018-05-23 09:00:04 +0000 |
commit | 5d95676ecc665395bad96b3a8b2930715e5b947b (patch) | |
tree | 99dc9183396f86cadf7cbd068f6ca8af92a1f42c | |
parent | f0dbfedc810f6d8aabf6b2031c79fd47362991c3 (diff) |
Call the subscription hook from the plugins even if fetch_file_contents returned no data
This allows a plug-in to override the fetch when the core fetch method fails for some feeds (eg. Tumblr feeds when requested from an EU IP).
-rwxr-xr-x | classes/feeds.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/classes/feeds.php b/classes/feeds.php index 015418328..47a6b56b8 100755 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -1466,6 +1466,10 @@ class Feeds extends Handler_Protected { $contents = @fetch_file_contents($url, false, $auth_login, $auth_pass); + foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_SUBSCRIBE_FEED) as $plugin) { + $contents = $plugin->hook_subscribe_feed($contents, $url, $auth_login, $auth_pass); + } + if (!$contents) { if (preg_match("/cloudflare\.com/", $fetch_last_error_content)) { $fetch_last_error .= " (feed behind Cloudflare)"; @@ -1474,10 +1478,6 @@ class Feeds extends Handler_Protected { return array("code" => 5, "message" => $fetch_last_error); } - foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_SUBSCRIBE_FEED) as $plugin) { - $contents = $plugin->hook_subscribe_feed($contents, $url, $auth_login, $auth_pass); - } - if (is_html($contents)) { $feedUrls = get_feeds_from_html($url, $contents); |