Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS

diff --combined classes/feeds.php
index c52dcff6531dcfbe0540560c56a23cc2172391fe,d79380074397aea68980a7d09547e9e8e0508100..c57328fe7e57ffdcb613aa87ceb67a2120158f1d
--- 1/classes/feeds.php
--- 2/classes/feeds.php
+++ b/classes/feeds.php
@@@ -61,7 -61,7 +61,7 @@@ class Feeds extends Handler_Protected 
                                truncate_string($feed_title,30)."</a>";
  
                        if ($error) {
-                               $reply .= " (<span class=\"error\" title=\"$error\">Error</span>)";
+                               $reply .= "&nbsp;<img title='$error' src='images/error.png' alt='error' class=\"noborder\" style=\"vertical-align : middle\">";
                        }
  
                } else {
@@@ -288,16 -288,6 +288,16 @@@
                        $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);
 +
 +                              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"];
@@@ -370,6 -360,11 +370,6 @@@
                                $date_entered_fmt = T_sprintf("Imported at %s",
                                        make_local_datetime($line["date_entered"], false));
  
 -                              if (get_pref('SHOW_CONTENT_PREVIEW')) {
 -                                      $content_preview = " &mdash; " . truncate_string(strip_tags($line["content_preview"]),
 -                                              250);
 -                              }
 -
                                $score = $line["score"];
  
                                $score_pic = "images/" . get_score_pic($score);
@@@ -460,7 -455,9 +460,7 @@@
                                                truncate_string($line["title"], 200);
  
                                        if (get_pref('SHOW_CONTENT_PREVIEW')) {
 -                                              if ($content_preview) {
 -                                                      $reply['content'] .= "<span class=\"contentPreview\">$content_preview</span>";
 -                                              }
 +                                                      $reply['content'] .= "<span class=\"contentPreview\">" . $line["content_preview"] . "</span>";
                                        }
  
                                        $reply['content'] .= "</a></span>";
@@@ -505,7 -502,7 +505,7 @@@
                                        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) {
@@@ -577,8 -574,8 +577,8 @@@
                                        else
                                                $excerpt_hidden = "style=\"display : none\"";
  
 -                                      $reply['content'] .= "<span $excerpt_hidden
 -                                              id=\"CEXC-$id\" class=\"cdmExcerpt\">$content_preview</span>";
 +                                      $reply['content'] .= "<span $excerpt_hidden id=\"CEXC-$id\" class=\"cdmExcerpt\">" . $line["content_preview"] . "</span>";
 +
                                        $reply['content'] .= "</span>";
  
                                        if (!get_pref('VFEED_GROUP_BY_FEED')) {