]> git.wh0rd.org Git - tt-rss.git/commitdiff
move reassigning content_preview after hook to a more sensible place
authorAndrew Dolgov <fox@fakecake.org>
Wed, 10 Jul 2013 12:52:03 +0000 (16:52 +0400)
committerAndrew Dolgov <fox@fakecake.org>
Wed, 10 Jul 2013 12:52:03 +0000 (16:52 +0400)
classes/feeds.php

index 90de755b3c2a9b685619af5133cb848967137702..c52dcff6531dcfbe0540560c56a23cc2172391fe 100644 (file)
@@ -286,12 +286,18 @@ class Feeds extends Handler_Protected {
                        if ($_REQUEST["debug"]) $timing_info = print_checkpoint("PS", $timing_info);
 
                        $expand_cdm = get_pref('CDM_EXPANDED');
-                               
+
                        while ($line = $this->dbh->fetch_assoc($result)) {
-                               $line["content_preview"] =  "&mdash; " . truncate_string(strip_tags($line["content_preview"]),250);
+                               $line["content_preview"] =  "&mdash; " . truncate_string(strip_tags($line["content_preview"]), 250);
+
                                foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
                                        $line = $p->hook_query_headlines($line, 250, false);
                                }
+
+                               if (get_pref('SHOW_CONTENT_PREVIEW')) {
+                                       $content_preview =  $line["content_preview"];
+                               }
+
                                $id = $line["id"];
                                $feed_id = $line["feed_id"];
                                $label_cache = $line["label_cache"];
@@ -364,10 +370,6 @@ 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') ) {
-                                               $content_preview =  $line["content_preview"];   
-                               }
-
                                $score = $line["score"];
 
                                $score_pic = "images/" . get_score_pic($score);