public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2026-02-10 16:01:33 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin' into hookhead

Browse Source 
Conflicts:
	classes/feeds.php

fix for merging up to the origin
This commit is contained in:
justauser
2013-06-27 11:57:49 -04:00
parent 891e36f57e fac0964053
commit 7171f32dc5
10 changed files with 317 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
classes/feeds.php
View File

@@ -363,12 +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"];
@@ -462,7 +465,7 @@ class Feeds extends Handler_Protected {
if (get_pref('SHOW_CONTENT_PREVIEW')) {
if ($content_preview) {
$reply['content'] .= "<span class=\"contentPreview\"> - $content_preview</span>";
$reply['content'] .= "<span class=\"contentPreview\">$content_preview</span>";
}
}
@@ -581,7 +584,11 @@ class Feeds extends Handler_Protected {
$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')) {