diff options
| author | Andrew Dolgov <[email protected]> | 2011-11-14 11:55:57 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2011-11-14 11:55:57 +0400 |
| commit | d1fc2f92a2fcf7bce91339a9b39293d506c20bdf (patch) | |
| tree | 1ec513e5fba39e45398f854bb72ae7990aeb2847 /functions.php | |
| parent | 13992673e4c7f6706a720c11b239c60519a0fd62 (diff) | |
remove feed_site_url hack in headlines generator
Diffstat (limited to 'functions.php')
| -rw-r--r-- | functions.php | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/functions.php b/functions.php index 90f9e8a09..0dd9ccab3 100644 --- a/functions.php +++ b/functions.php @@ -3699,6 +3699,7 @@ label_cache, tag_cache, always_display_enclosures, + site_url, note, num_comments, comments, @@ -3738,7 +3739,11 @@ "unread," . "feed_id," . "orig_feed_id," . + "site_url," . + "always_display_enclosures, ". "marked," . + "num_comments, " . + "comments, " . "tag_cache," . "label_cache," . "link," . @@ -5501,18 +5506,7 @@ } } - // FIXME: make this less of a hack - - $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"); - } - } + $feed_site_url = $line["site_url"]; $article_content = sanitize_rss($link, $line["content_preview"], false, false, $feed_site_url); |