From c83a5aec38eca361fa459984f17fb4417d4f5a9a Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 21 Sep 2011 08:41:22 +0400 Subject: [PATCH] check_feed_favicon: only guess favicon url when local icon doesn't exist (closes #369) --- functions.php | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/functions.php b/functions.php index 5ec459fa..d8ee0a95 100644 --- a/functions.php +++ b/functions.php @@ -465,21 +465,24 @@ } // function get_favicon_url function check_feed_favicon($site_url, $feed, $link) { - $favicon_url = get_favicon_url($site_url); - # print "FAVICON [$site_url]: $favicon_url\n"; $icon_file = ICONS_DIR . "/$feed.ico"; - if ($favicon_url && !file_exists($icon_file)) { - $contents = fetch_file_contents($favicon_url, "image"); - if ($contents) { - $fp = fopen($icon_file, "w"); + if (!file_exists($icon_file)) { + $favicon_url = get_favicon_url($site_url); - if ($fp) { - fwrite($fp, $contents); - fclose($fp); - chmod($icon_file, 0644); + if ($favicon_url) { + $contents = fetch_file_contents($favicon_url, "image"); + + if ($contents) { + $fp = fopen($icon_file, "w"); + + if ($fp) { + fwrite($fp, $contents); + fclose($fp); + chmod($icon_file, 0644); + } } } } -- 2.39.5