From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Fri, 8 Feb 2013 13:19:43 +0000 (+0400)
Subject: remove processing of ttrss_feeds.icon_url
X-Git-Tag: 1.7.0~7
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=750cfcd2fa5e2fe94eaee3de2492ba54797f1a64;p=tt-rss.git

remove processing of ttrss_feeds.icon_url
---

diff --git a/include/functions.php b/include/functions.php
index db9a7fd6..b64d1b37 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 = "&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 a3cb94c7..a2e2a08c 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...");
 			}
diff --git a/tt-rss.css b/tt-rss.css
index 5c504248..11bffe17 100644
--- 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;