? .DS_Store
? 415710-favicon-no-tert.patch
Index: includes/file.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/file.inc,v
retrieving revision 1.121.2.12
diff -u -r1.121.2.12 file.inc
--- includes/file.inc	11 May 2010 09:49:58 -0000	1.121.2.12
+++ includes/file.inc	5 Jul 2010 23:21:57 -0000
@@ -1297,7 +1297,7 @@
       'cdr' => 'image/x-coreldraw',
       'pat' => 'image/x-coreldrawpattern',
       'cdt' => 'image/x-coreldrawtemplate',
-      'ico' => 'image/x-icon',
+      'ico' => 'image/vnd.microsoft.icon',
       'art' => 'image/x-jg',
       'jng' => 'image/x-jng',
       'bmp' => 'image/x-ms-bmp',
Index: includes/theme.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/theme.inc,v
retrieving revision 1.415.2.27
diff -u -r1.415.2.27 theme.inc
--- includes/theme.inc	1 Mar 2010 10:02:01 -0000	1.415.2.27
+++ includes/theme.inc	5 Jul 2010 23:22:00 -0000
@@ -1807,7 +1807,12 @@
 function template_preprocess_page(&$variables) {
   // Add favicon
   if (theme_get_setting('toggle_favicon')) {
-    drupal_set_html_head('<link rel="shortcut icon" href="'. check_url(theme_get_setting('favicon')) .'" type="image/x-icon" />');
+    $favicon = theme_get_setting('favicon');
+    $favicon_type = file_get_mimetype($favicon);
+    if ($favicon_type == 'application/octet-stream') {
+      $favicon_type = 'image/vnd.microsoft.icon';
+    }
+    drupal_set_html_head('<link rel="shortcut icon" href="'. check_url($favicon) .'" type="'.  check_plain($favicon_type) .'" />');
   }
 
   global $theme;
Index: includes/theme.maintenance.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/theme.maintenance.inc,v
retrieving revision 1.10.2.2
diff -u -r1.10.2.2 theme.maintenance.inc
--- includes/theme.maintenance.inc	4 Mar 2010 00:15:28 -0000	1.10.2.2
+++ includes/theme.maintenance.inc	5 Jul 2010 23:22:00 -0000
@@ -208,7 +208,12 @@
 function template_preprocess_maintenance_page(&$variables) {
   // Add favicon
   if (theme_get_setting('toggle_favicon')) {
-    drupal_set_html_head('<link rel="shortcut icon" href="'. check_url(theme_get_setting('favicon')) .'" type="image/x-icon" />');
+    $favicon = theme_get_setting('favicon');
+    $favicon_type = file_get_mimetype($favicon);
+    if ($favicon_type == 'application/octet-stream') {
+      $favicon_type = 'image/vnd.microsoft.icon';
+    }
+    drupal_set_html_head('<link rel="shortcut icon" href="'. check_url($favicon) .'" type="'.  check_plain($favicon_type) .'" />');
   }
 
   global $theme;