Merge pull request #415 from ValdisVitolins/master

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

diff --git a/classes/feeds.php b/classes/feeds.php
index ca470c03291bddd9664b8afdf8332ba113f476e6..5ec10961438ffe7a5e89ef8454cdef059fd28ec2 100644 (file)
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -136,7 +136,7 @@ class Feeds extends Handler_Protected {
                //$reply .= "</h2";
 
                foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_HEADLINE_TOOLBAR_BUTTON) as $p) {
-                        echo $p->hook_headline_toolbar_button($feed_id, $is_cat);
+                        $reply .= $p->hook_headline_toolbar_button($feed_id, $is_cat);
                }
 
                $reply .= "</span></span>";
@@ -281,6 +281,12 @@ class Feeds extends Handler_Protected {
                        }
                } */
 
+               if ($offset == 0) {
+                       foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_HEADLINES_BEFORE) as $p) {
+                                $reply['content'] .= $p->hook_headlines_before($feed, $cat_view, $qfh_ret);
+                       }
+               }
+
                if ($this->dbh->num_rows($result) > 0) {
 
                        $lnum = $offset;
@@ -1147,7 +1153,7 @@ class Feeds extends Handler_Protected {
 
                print "<div class=\"dlgButtons\">";
 
-               if (!SPHINX_ENABLED) {
+               if (count(PluginHost::getInstance()->get_hooks(PluginHost::HOOK_SEARCH)) == 0) {
                        print "<div style=\"float : left\">
                                <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/wiki/SearchSyntax\">".__("Search syntax")."</a>
                                </div>";