1
0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-13 15:25:59 +00:00

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

This commit is contained in:
Andrew Dolgov
2017-12-11 12:54:30 +03:00
2 changed files with 10 additions and 1 deletions

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