Merge branch 'master' of binfalse/tt-rss into master

[tt-rss.git] / classes / pluginhost.php

diff --git a/classes/pluginhost.php b/classes/pluginhost.php
index 561a10a41d15b3a66151bbee0955873e4ad60099..4eada78b297b3b7c983314101b702b07c7bc254f 100644 (file)
--- a/classes/pluginhost.php
+++ b/classes/pluginhost.php
@@ -1,6 +1,5 @@
 <?php
 class PluginHost {
-       private $dbh;
        private $pdo;
        private $hooks = array();
        private $plugins = array();
@@ -57,13 +56,13 @@ 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;
        const KIND_USER = 3;
 
        function __construct() {
-               $this->dbh = Db::get();
                $this->pdo = Db::pdo();
 
                $this->storage = array();
@@ -91,7 +90,7 @@ class PluginHost {
        }
 
        function get_dbh() {
-               return $this->dbh;
+               return Db::get();
        }
 
        function get_pdo() {
@@ -281,8 +280,6 @@ class PluginHost {
                } else {
                        return false;
                }
-
-               return false;
        }
 
        function get_commands() {
@@ -363,7 +360,9 @@ class PluginHost {
        function get_all($sender) {
                $idx = get_class($sender);
 
-               return $this->storage[$idx];
+               $data = $this->storage[$idx];
+
+               return $data ? $data : [];
        }
 
        function clear_data($sender) {