experimental new plugin system

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

diff --git a/classes/feeds.php b/classes/feeds.php
index 49adf38795b8381d0182ab43d08e383a051971f7..a90b1c8ed7059679231df43ac86b32d53972a7cd 100644 (file)
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -249,7 +249,7 @@ class Feeds extends Handler_Protected {
 \r
                $headlines_count = db_num_rows($result);\r
 \r
-               if (get_pref($this->link, 'COMBINED_DISPLAY_MODE')) {\r
+               /* if (get_pref($this->link, 'COMBINED_DISPLAY_MODE')) {\r
                        $button_plugins = array();\r
                        foreach (explode(",", ARTICLE_BUTTON_PLUGINS) as $p) {\r
                                $pclass = "button_" . trim($p);\r
@@ -259,7 +259,9 @@ class Feeds extends Handler_Protected {
                                        array_push($button_plugins, $plugin);\r
                                }\r
                        }\r
-               }\r
+               } */\r
+\r
+               global $pluginhost;\r
 \r
                if (db_num_rows($result) > 0) {\r
 \r
@@ -706,8 +708,8 @@ class Feeds extends Handler_Protected {
 \r
                                        //$note_escaped = htmlspecialchars($line['note'], ENT_QUOTES);\r
 \r
-                                       foreach ($button_plugins as $p) {\r
-                                               $reply['content'] .= $p->render($id, $line);\r
+                                       foreach ($pluginhost->get_hooks($pluginhost::HOOK_ARTICLE_BUTTON) as $p) {\r
+                                               $reply['content'] .= $p->hook_article_button($line);\r
                                        }\r
 \r
                                        $reply['content'] .= "<img src=\"images/digest_checkbox.png\"\r