diff options
| author | justauser <[email protected]> | 2013-06-27 11:57:49 -0400 |
|---|---|---|
| committer | justauser <[email protected]> | 2013-06-27 11:57:49 -0400 |
| commit | 7171f32dc5ace4f36e1e70605ae96ebdbdf25c4f (patch) | |
| tree | e998d4fca34cebe801c982d1d7bf8932adbf218a /classes/feeds.php | |
| parent | 891e36f57e2e3955a4f13019e8fdc58fce826434 (diff) | |
| parent | fac096405338e0f46fa248320318436d862678fc (diff) | |
Merge remote-tracking branch 'origin' into hookhead
Conflicts:
classes/feeds.php
fix for merging up to the origin
Diffstat (limited to 'classes/feeds.php')
| -rw-r--r-- | classes/feeds.php | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/classes/feeds.php b/classes/feeds.php index fd4c7fe53..85276a4b1 100644 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -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')) { |