blallo/tt-rss
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of git.tt-rss.org:git/tt-rss into pdo-experimental

Browse source
This commit is contained in:
Andrew Dolgov 2017-12-11 12:54:30 +03:00
commit f70d456a5b
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
classes/pluginhost.php
View file

@ -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;

10
classes/pref/feeds.php Executable file → Normal file
View file

@ -1554,6 +1554,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;
}
}
$pdo = Db::pdo();
@ -1780,4 +1788,4 @@ class Pref_Feeds extends Handler_Protected {
return $url_path;
}
}
}