Merge remote-tracking branch 'origin' into hookhead

Conflicts:
	classes/feeds.php

fix for merging up to the origin

diff --cc classes/feeds.php
index fd4c7fe533ea605f57f423baf05a48afd47b3a9b,33f239ee6ad128194405a377e238edfaf742b391..85276a4b1d1f18c5398f2e2f2d901f0a75ec2b33
--- 1/classes/feeds.php
--- 2/classes/feeds.php
+++ b/classes/feeds.php
@@@ -363,12 -360,9 +363,15 @@@ 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') ) {
++#                                     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);
                                }
  
                                $score = $line["score"];
@@@ -581,7 -575,7 +584,11 @@@
                                                $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')) {

diff --cc classes/pref/filters.php
Simple merge