remove processing of ttrss_feeds.icon_url

diff --git a/include/functions.php b/include/functions.php
index db9a7fd613ff4798f2887af7b4871bc74217a4a7..b64d1b373d4cdf25c4c98b25b12e346abd72bd59 100644 (file)
--- 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 = "&nbsp;";
-                       }
-
                        $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 a3cb94c7073856a91dbcd492ed073f4dd4c5e1d3..a2e2a08c4030259cbe44b1b92303c9cefadc3f04 100644 (file)
--- 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...");
                        }

diff --git a/tt-rss.css b/tt-rss.css
index 5c5042482d06477a0818fcd609962d8576ee6b53..11bffe175da5b48f4107d7496c6be596177037b9 100644 (file)
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -60,17 +60,6 @@ div.postReply div.postContent img {
        max-width : 98%;
 }
 
-div.postReply div.postIcon {
-       float : right;
-       border : 0px;
-       margin : 5px;
-}
-
-div.postReply div.postIcon img {
-       max-width : 120px;
-       display : inline;
-}
-
 div.postReply div.postEnclosures {
        margin-top : 1em;
        color : gray;