From 4ab1eb9c946f2a13262f9d95ca026e76051d8caa Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 10 Jul 2013 16:52:03 +0400 Subject: [PATCH] move reassigning content_preview after hook to a more sensible place --- classes/feeds.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/classes/feeds.php b/classes/feeds.php index 90de755b3..c52dcff65 100644 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -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"] = "— " . truncate_string(strip_tags($line["content_preview"]),250); + $line["content_preview"] = "— " . 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);