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

diff --cc classes/pluginhost.php
Simple merge

diff --cc classes/pref/feeds.php
index 0b5a445f3f0ef8bf69c6ec16ab343b9ee7999e0a,2a9c57e790345ca2a6cc283c165a9b08861a27f1..846e814ee494ae18d4addd6fa7a2ba7dbb233a5d
mode 100755,100644..100644
--- 1/classes/pref/feeds.php
--- 2/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 */