Merge remote-tracking branch 'origin' into hookhead

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

diff --git a/classes/feeds.php b/classes/feeds.php
index 33f239ee6ad128194405a377e238edfaf742b391..85276a4b1d1f18c5398f2e2f2d901f0a75ec2b33 100644 (file)
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -288,6 +288,9 @@ class Feeds extends Handler_Protected {
                        $expand_cdm = get_pref('CDM_EXPANDED');
 
                        while ($line = $this->dbh->fetch_assoc($result)) {
+                               foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
+                                       $line = $p->hook_query_headlines($line, 250);
+                               }
                                $id = $line["id"];
                                $feed_id = $line["feed_id"];
                                $label_cache = $line["label_cache"];
@@ -360,6 +363,12 @@ class Feeds extends Handler_Protected {
                                $date_entered_fmt = T_sprintf("Imported at %s",
                                        make_local_datetime($line["date_entered"], false));
 
+#                              if (get_pref('SHOW_CONTENT_PREVIEW') ) {
+#                                      if(isset($line["modified_preview"]))
+#                                              $content_preview = strip_tags($line["content_preview"]);
+#                                      else
+#                                              $content_preview = truncate_string(strip_tags($line["content_preview"]),
+#                                                      250);
                                if (get_pref('SHOW_CONTENT_PREVIEW')) {
                                        $content_preview = " — " . truncate_string(strip_tags($line["content_preview"]),
                                                250);
@@ -502,7 +511,7 @@ class Feeds extends Handler_Protected {
                                        else
                                                $tags = false;
 
-                                       $line["content"] = sanitize($line["content_preview"],
+                                       $line["content"] = sanitize($line["content"],
                                                        sql_bool_to_bool($line['hide_images']), false, $entry_site_url);
 
                                        foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_RENDER_ARTICLE_CDM) as $p) {
@@ -575,7 +584,11 @@ class Feeds extends Handler_Protected {
                                                $excerpt_hidden = "style=\"display : none\"";
 
                                        $reply['content'] .= "<span $excerpt_hidden
+<<<<<<< HEAD
+                                               id=\"CEXC-$id\" class=\"cdmExcerpt\"> -" . $content_preview . "</span>";
+=======
                                                id=\"CEXC-$id\" class=\"cdmExcerpt\">$content_preview</span>";
+>>>>>>> origin
                                        $reply['content'] .= "</span>";
 
                                        if (!get_pref('VFEED_GROUP_BY_FEED')) {