diff options
author | fox <[email protected]> | 2017-12-11 09:47:04 +0000 |
---|---|---|
committer | Gogs <[email protected]> | 2017-12-11 09:47:04 +0000 |
commit | c463a95dca0a5f2fbcdc1b67fd97f8c1159523f5 (patch) | |
tree | 1c9d2a02d2839370cbfb84c5d443eddcfc3187bf | |
parent | 7c4d7bce3f15afbdab0487e101cd2f85afed8bd5 (diff) | |
parent | e58a14de724da8f110525ba4faf5ecf8f006b3f5 (diff) |
Merge branch 'master' of dim0x69/tt-rss into master
-rw-r--r-- | classes/pluginhost.php | 1 | ||||
-rw-r--r--[-rwxr-xr-x] | classes/pref/feeds.php | 10 |
2 files changed, 10 insertions, 1 deletions
diff --git a/classes/pluginhost.php b/classes/pluginhost.php index 533e7ee91..f56343c5f 100644 --- a/classes/pluginhost.php +++ b/classes/pluginhost.php @@ -56,6 +56,7 @@ class PluginHost { const HOOK_FORMAT_ARTICLE_CDM = 35; const HOOK_FEED_BASIC_INFO = 36; const HOOK_SEND_LOCAL_FILE = 37; + const HOOK_UNSUBSCRIBE_FEED = 38; const KIND_ALL = 1; const KIND_SYSTEM = 2; diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php index a86a1af94..2a9c57e79 100755..100644 --- a/classes/pref/feeds.php +++ b/classes/pref/feeds.php @@ -1739,6 +1739,14 @@ class Pref_Feeds extends Handler_Protected { } static function remove_feed($id, $owner_uid) { + $debug = isset($_REQUEST["debug"]); + + foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_UNSUBSCRIBE_FEED) as $p) { + if( ! $p->hook_unsubscribe_feed($id, $owner_uid)){ + if($debug) _debug("Feed not removed due to Error in Plugin. (HOOK_UNSUBSCRIBE_FEED)"); + return; + } + } if ($id > 0) { @@ -1969,4 +1977,4 @@ class Pref_Feeds extends Handler_Protected { return $url_path; } -}
\ No newline at end of file +} |