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

remove feed_site_url hack in headlines generator

This commit is contained in:
Andrew Dolgov 2011-11-14 11:55:57 +04:00
parent 13992673e4
commit d1fc2f92a2
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
functions.php
View File

@ -3699,6 +3699,7 @@
label_cache, label_cache,
tag_cache, tag_cache,
always_display_enclosures, always_display_enclosures,
site_url,
note, note,
num_comments, num_comments,
comments, comments,
@ -3738,7 +3739,11 @@
"unread," . "unread," .
"feed_id," . "feed_id," .
"orig_feed_id," . "orig_feed_id," .
"site_url," .
"always_display_enclosures, ".
"marked," . "marked," .
"num_comments, " .
"comments, " .
"tag_cache," . "tag_cache," .
"label_cache," . "label_cache," .
"link," . "link," .
@ -5501,18 +5506,7 @@
} }
} }
// FIXME: make this less of a hack $feed_site_url = $line["site_url"];
$feed_site_url = false;
if ($line["feed_id"]) {
$tmp_result = db_query($link, "SELECT site_url FROM ttrss_feeds
WHERE id = " . $line["feed_id"]);
if (db_num_rows($tmp_result) == 1) {
$feed_site_url = db_fetch_result($tmp_result, 0, "site_url");
}
}
$article_content = sanitize_rss($link, $line["content_preview"], $article_content = sanitize_rss($link, $line["content_preview"],
false, false, $feed_site_url); false, false, $feed_site_url);