From: Andrew Dolgov <noreply@madoka.volgo-balt.ru>
Date: Mon, 11 Dec 2017 09:54:30 +0000 (+0300)
Subject: Merge branch 'master' of git.tt-rss.org:git/tt-rss into pdo-experimental
X-Git-Tag: 18.8~119
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=f70d456a5bc509e56991195a2f003cf2714d0e13;p=tt-rss.git

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

f70d456a5bc509e56991195a2f003cf2714d0e13
diff --cc classes/pref/feeds.php
index 0b5a445f,2a9c57e7..846e814e
mode 100755,100644..100644
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@@ -1554,11 -1739,16 +1554,19 @@@ class Pref_Feeds extends Handler_Protec
  	}
  
  	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();
 +
  		if ($id > 0) {
 +			$pdo->beginTransaction();
  
  			/* save starred articles in Archived feed */