From: Andrew Dolgov Date: Wed, 24 Apr 2013 15:01:51 +0000 (+0400) Subject: do not needlessly mark icons as failed X-Git-Tag: 1.7.9~25^2~91 X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=aafd55bab612a78816f0e91b7c8bfec1d3746f32;p=tt-rss.git do not needlessly mark icons as failed --- diff --git a/include/rssfuncs.php b/include/rssfuncs.php index 6bb841c5..f806d480 100644 --- a/include/rssfuncs.php +++ b/include/rssfuncs.php @@ -418,9 +418,6 @@ /* terrible hack: if we crash on floicon shit here, we won't check * 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); @@ -435,6 +432,9 @@ if (file_exists($favicon_file) && function_exists("imagecreatefromstring") && $favicon_avg_color == '') { require_once "colors.php"; + db_query("UPDATE ttrss_feeds SET favicon_avg_color = 'fail' WHERE + id = '$feed'"); + $favicon_color = db_escape_string( calculate_avg_color($favicon_file));