From 24057c3d53a22373e0b575a36f49ab8e965b6934 Mon Sep 17 00:00:00 2001
From: Angie Byron <webchick@24967.no-reply.drupal.org>
Date: Tue, 4 Aug 2009 07:04:21 +0000
Subject: #531476 by aaron and mfb: Add favicon mimetype as a theme setting to
 avoid expensive calls to file system.

---
 includes/theme.inc             | 8 +++-----
 includes/theme.maintenance.inc | 6 +-----
 2 files changed, 4 insertions(+), 10 deletions(-)

(limited to 'includes')

diff --git a/includes/theme.inc b/includes/theme.inc
index 15795e68b..562655e90 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -1041,6 +1041,8 @@ function theme_get_settings($key = NULL) {
     'logo_path'                        =>  '',
     'default_favicon'                  =>  1,
     'favicon_path'                     =>  '',
+    // Use the IANA-registered MIME type for ICO files as default.
+    'favicon_mimetype'                 =>  'image/vnd.microsoft.icon',
     'main_menu'                        =>  1,
     'secondary_menu'                   =>  1,
     'toggle_logo'                      =>  1,
@@ -1888,11 +1890,7 @@ function template_preprocess_page(&$variables) {
   // Add favicon.
   if (theme_get_setting('toggle_favicon')) {
     $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';
-    }
+    $type = theme_get_setting('favicon_mimetype');
     drupal_add_html_head('<link rel="shortcut icon" href="' . check_url($favicon) . '" type="' . check_plain($type) . '" />');
   }
 
diff --git a/includes/theme.maintenance.inc b/includes/theme.maintenance.inc
index 2dacf27ab..20b2f6505 100644
--- a/includes/theme.maintenance.inc
+++ b/includes/theme.maintenance.inc
@@ -216,11 +216,7 @@ function template_preprocess_maintenance_page(&$variables) {
   // Add favicon
   if (theme_get_setting('toggle_favicon')) {
     $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';
-    }
+    $type = theme_get_setting('favicon_mimetype');
     drupal_add_html_head('<link rel="shortcut icon" href="' . check_url($favicon) . '" type="' . check_plain($type) . '" />');
   }
 
-- 
cgit v1.2.3