From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 23 Apr 2013 18:33:23 +0000 (+0400)
Subject: attempt to recalculate favicon avg color if it changes
X-Git-Tag: 1.7.9~25^2~108
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=560cbd8c0dc1bdd7418c2e259d80c78281039769;p=tt-rss.git

attempt to recalculate favicon avg color if it changes
---

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 8bc5fcbd..bc054ca5 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -417,15 +417,21 @@
 			if ($favicon_needs_check || $force_refetch) {
 
 				/* terrible hack: if we crash on floicon shit here, we won't check
-				 * the icon avgcolor again */
+				 * the icon avgcolor again (unless the icon got updated) */
 
 				db_query("UPDATE ttrss_feeds SET favicon_avg_color = 'fail' WHERE
 					id = '$feed'");
 
+				$favicon_file = ICONS_DIR . "/$feed.ico";
+				$favicon_modified = @filemtime($favicon_file);
+
 				_debug("checking favicon...", $debug_enabled);
 
 				check_feed_favicon($site_url, $feed, $link);
-				$favicon_file = ICONS_DIR . "/$feed.ico";
+				$favicon_modified_new = @filemtime($favicon_file);
+
+				if ($favicon_modified_new > $favicon_modified)
+					$favicon_avg_color = '';
 
 				if (file_exists($favicon_file) && function_exists("imagecreatefromstring") && $favicon_avg_color != 'fail') {
 						require_once "colors.php";