From: justauser <justausr@hotmail.com>
Date: Thu, 27 Jun 2013 15:57:49 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin' into hookhead
X-Git-Tag: 1.9~61^2~8
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=7171f32dc5ace4f36e1e70605ae96ebdbdf25c4f;p=tt-rss.git

Merge remote-tracking branch 'origin' into hookhead

Conflicts:
	classes/feeds.php

fix for merging up to the origin
---

7171f32dc5ace4f36e1e70605ae96ebdbdf25c4f
diff --cc classes/feeds.php
index fd4c7fe5,33f239ee..85276a4b
--- a/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 = " &mdash; " . 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')) {