From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Mon, 18 Mar 2013 11:42:28 +0000 (+0400)
Subject: in combined mode, when viewing vfeeds relative urls are rewritten incorrectly (fixes... 
X-Git-Tag: 1.7.5~136
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=08dfc22391eab9934cde1f747240d9ff5bc50b41;p=tt-rss.git

in combined mode, when viewing vfeeds relative urls are rewritten incorrectly (fixes #586)
---

diff --git a/classes/feeds.php b/classes/feeds.php
index b5010a05..d6cd2a25 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>";