diff options
| author | justauser <[email protected]> | 2013-06-27 12:21:14 -0400 |
|---|---|---|
| committer | justauser <[email protected]> | 2013-06-27 12:21:14 -0400 |
| commit | 2e188438456314d4cffab67c6a0baddb0b364b05 (patch) | |
| tree | 25a5c425d52d39aefc3b94fb0d4cf4540e979368 /classes | |
| parent | 0708046b4f0c3f430258f561dbc1a51ed5d92888 (diff) | |
one more change to merge to origin
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/feeds.php | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/classes/feeds.php b/classes/feeds.php index 409824f96..b0447fd25 100644 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -580,12 +580,8 @@ class Feeds extends Handler_Protected { else $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 $excerpt_hidden id=\"CEXC-$id\" class=\"cdmExcerpt\">$content_preview</span>"; + $reply['content'] .= "</span>"; if (!get_pref('VFEED_GROUP_BY_FEED')) { |