diff options
author | Richard Beales <[email protected]> | 2013-03-18 13:55:54 +0000 |
---|---|---|
committer | Richard Beales <[email protected]> | 2013-03-18 13:55:54 +0000 |
commit | 1d707e9f03d1a654e0807aadce7ab790befd0b95 (patch) | |
tree | 923404b0b57939cb74a4989197184966705ff0fe /classes/feeds.php | |
parent | 7c97d17aaf373339a8bcd917ad59ca6018148f0d (diff) | |
parent | e9f42579a38a03c9cdc454a712cb0ab68069226d (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'classes/feeds.php')
-rw-r--r-- | classes/feeds.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/classes/feeds.php b/classes/feeds.php index b5010a05f..d6cd2a255 100644 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -388,6 +388,8 @@ class Feeds extends Handler_Protected { $feed_icon_img = "<img class=\"tinyFeedIcon\" src=\"images/pub_set.svg\" alt=\"\">"; } + $entry_site_url = $line["site_url"]; + if (!get_pref($this->link, 'COMBINED_DISPLAY_MODE')) { if (get_pref($this->link, 'VFEED_GROUP_BY_FEED')) { @@ -474,7 +476,7 @@ class Feeds extends Handler_Protected { unset($line["tag_cache"]); $line["content"] = sanitize($this->link, $line["content_preview"], - false, false, $feed_site_url); + false, false, $entry_site_url); foreach ($pluginhost->get_hooks($pluginhost::HOOK_RENDER_ARTICLE_CDM) as $p) { $line = $p->hook_render_article_cdm($line); @@ -614,8 +616,6 @@ class Feeds extends Handler_Protected { } } - $feed_site_url = $line["site_url"]; - $reply['content'] .= "<span id=\"CWRAP-$id\">"; $reply['content'] .= $line["content"]; $reply['content'] .= "</span>"; |