diff options
| author | Andrew Dolgov <[email protected]> | 2013-02-08 17:19:43 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2013-02-08 17:19:43 +0400 |
| commit | 750cfcd2fa5e2fe94eaee3de2492ba54797f1a64 (patch) | |
| tree | ec6880a0c2a2dfb19d0e0f01759d86fc5f39cf6e /include | |
| parent | 8853f0ed5b2988ff1db5c387fb97b5cfd7595aae (diff) | |
remove processing of ttrss_feeds.icon_url
Diffstat (limited to 'include')
| -rw-r--r-- | include/functions.php | 12 | ||||
| -rw-r--r-- | include/rssfuncs.php | 10 |
2 files changed, 1 insertions, 21 deletions
diff --git a/include/functions.php b/include/functions.php index db9a7fd61..b64d1b373 100644 --- a/include/functions.php +++ b/include/functions.php @@ -2852,7 +2852,6 @@ $result = db_query($link, "SELECT id,title,link,content,feed_id,comments,int_id, ".SUBSTRING_FOR_DATE."(updated,1,16) as updated, - (SELECT icon_url FROM ttrss_feeds WHERE id = feed_id) as icon_url, (SELECT site_url FROM ttrss_feeds WHERE id = feed_id) as site_url, num_comments, tag_cache, @@ -2867,12 +2866,6 @@ $line = db_fetch_assoc($result); - if ($line["icon_url"]) { - $feed_icon = "<img src=\"" . $line["icon_url"] . "\">"; - } else { - $feed_icon = " "; - } - $feed_site_url = $line['site_url']; $num_comments = $line["num_comments"]; @@ -3012,11 +3005,6 @@ } $rv['content'] .= "</div>"; - $rv['content'] .= "<div class=\"postIcon\">" . - "<a target=\"_blank\" title=\"".__("Visit the website")."\"$ - href=\"".htmlspecialchars($feed_site_url)."\">". - $feed_icon . "</a></div>"; - $rv['content'] .= "<div class=\"postContent\">"; // N-grams diff --git a/include/rssfuncs.php b/include/rssfuncs.php index a3cb94c70..a2e2a08c4 100644 --- a/include/rssfuncs.php +++ b/include/rssfuncs.php @@ -285,13 +285,12 @@ $favicon_interval_qpart = "favicon_last_checked < DATE_SUB(NOW(), INTERVAL 12 HOUR)"; } - $result = db_query($link, "SELECT title,icon_url,site_url,owner_uid, + $result = db_query($link, "SELECT title,site_url,owner_uid, (favicon_last_checked IS NULL OR $favicon_interval_qpart) AS favicon_needs_check FROM ttrss_feeds WHERE id = '$feed'"); $registered_title = db_fetch_result($result, 0, "title"); - $orig_icon_url = db_fetch_result($result, 0, "icon_url"); $orig_site_url = db_fetch_result($result, 0, "site_url"); $favicon_needs_check = sql_bool_to_bool(db_fetch_result($result, 0, "favicon_needs_check")); @@ -328,13 +327,6 @@ site_url = '$site_url' WHERE id = '$feed'"); } - $icon_url = db_escape_string(mb_substr( - rewrite_relative_url($fetch_url, $rss->get_image_url()), 0, 245)); - - if ($icon_url && $orig_icon_url != $icon_url) { - db_query($link, "UPDATE ttrss_feeds SET icon_url = '$icon_url' WHERE id = '$feed'"); - } - if ($debug_enabled) { _debug("update_rss_feed: loading filters & labels..."); } |