valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Andrew Dolgov 2013-03-18 15:42:28 +04:00
parent 76a7ae56d3
commit 08dfc22391
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
classes/feeds.php
View File

@ -388,6 +388,8 @@ class Feeds extends Handler_Protected {
$feed_icon_img = "<img class=\"tinyFeedIcon\" src=\"images/pub_set.svg\" alt=\"\">"; $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, 'COMBINED_DISPLAY_MODE')) {
if (get_pref($this->link, 'VFEED_GROUP_BY_FEED')) { if (get_pref($this->link, 'VFEED_GROUP_BY_FEED')) {
@ -474,7 +476,7 @@ class Feeds extends Handler_Protected {
unset($line["tag_cache"]); unset($line["tag_cache"]);
$line["content"] = sanitize($this->link, $line["content_preview"], $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) { foreach ($pluginhost->get_hooks($pluginhost::HOOK_RENDER_ARTICLE_CDM) as $p) {
$line = $p->hook_render_article_cdm($line); $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'] .= "<span id=\"CWRAP-$id\">";
$reply['content'] .= $line["content"]; $reply['content'] .= $line["content"];
$reply['content'] .= "</span>"; $reply['content'] .= "</span>";