in combined mode, when viewing vfeeds relative urls are rewritten incorrectly (fixes...

diff --git a/classes/feeds.php b/classes/feeds.php
index b5010a05f65a210929d510909027d88097d9e62d..d6cd2a255393f5d0c1fe794eb2531453b1fe95ec 100644 (file)
--- 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>";