From 7584364a4c2b407e97909e94ba274da62620abea Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Mon, 29 Dec 2014 11:56:22 +0100 Subject: Fix behaviour when favicon url is not found If url is not find, we copy default favicon into favicon dir so at the next try, we don't search the url again. See https://github.com/FreshRSS/FreshRSS/issues/290 See https://github.com/FreshRSS/FreshRSS/issues/727 --- p/f.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'p/f.php') diff --git a/p/f.php b/p/f.php index d00b36eb0..fefbf9a10 100644 --- a/p/f.php +++ b/p/f.php @@ -7,19 +7,19 @@ include(LIB_PATH . '/Favicon/DataAccess.php'); $favicons_dir = DATA_PATH . '/favicons/'; -$default_favicon = PUBLIC_PATH . '/themes/icons/default_favicon.png'; +$default_favicon = PUBLIC_PATH . '/themes/icons/default_favicon.ico'; /* Télécharge le favicon d'un site et le place sur le serveur */ function download_favicon($website, $dest) { - global $favicons_dir; + global $favicons_dir, $default_favicon; $favicon_getter = new \Favicon\Favicon(); $favicon_getter->setCacheDir($favicons_dir); $favicon_url = $favicon_getter->get($website); if ($favicon_url === false) { - return false; + return @copy($default_favicon, $dest); } $c = curl_init($favicon_url); @@ -47,7 +47,7 @@ function show_default_favicon() { global $default_favicon; header('HTTP/1.1 404 Not Found'); - header('Content-Type: image/png'); + header('Content-Type: image/ico'); readfile($default_favicon); die(); } -- cgit v1.2.3