From d4a7074294d9e2a3c58d61b9fd0a078430446ace Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Sun, 17 May 2009 10:42:16 +0000
Subject: - Patch #415710 by dixon_, JohnAlbin, BMDan: fix favicon mime-type
 handling.

---
 includes/theme.maintenance.inc | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'includes/theme.maintenance.inc')

diff --git a/includes/theme.maintenance.inc b/includes/theme.maintenance.inc
index 92fefeece..d36ad3950 100644
--- a/includes/theme.maintenance.inc
+++ b/includes/theme.maintenance.inc
@@ -206,7 +206,13 @@ function theme_update_page($content, $show_messages = TRUE) {
 function template_preprocess_maintenance_page(&$variables) {
   // Add favicon
   if (theme_get_setting('toggle_favicon')) {
-    drupal_add_html_head('<link rel="shortcut icon" href="' . check_url(theme_get_setting('favicon')) . '" type="image/x-icon" />');
+    $favicon = theme_get_setting('favicon');
+    $type = file_get_mimetype($favicon);
+    // Use the genereic MIME type for favicons if no other was found.
+    if ($type == 'application/octet-stream') {
+      $type = 'image/x-icon';
+    }
+    drupal_add_html_head('<link rel="shortcut icon" href="' . check_url($favicon) . '" type="' . check_plain($type) . '" />');
   }
 
   global $theme;
-- 
cgit v1.2.3