From c8b7ad1cc5f67b114d1b491dff4bd661b88df81d Mon Sep 17 00:00:00 2001
From: glorieux <lorieux.g@gmail.com>
Date: Mon, 16 Dec 2013 12:13:18 +0100
Subject: Change favicon_link_tag helper mimetype from image/vnd.microsoft.icon
 to image/x-icon.

Although the official IANA-registered MIME type for ICO files is image/vnd.microsoft.icon,
registered in 2003, it was submitted to IANA by a third party and is not recognized by Microsoft products.
The MIME type image/x-icon should be used since is the one recognized by the major browsers on the market.
---
 actionview/lib/action_view/helpers/asset_tag_helper.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'actionview/lib/action_view')

diff --git a/actionview/lib/action_view/helpers/asset_tag_helper.rb b/actionview/lib/action_view/helpers/asset_tag_helper.rb
index aa49f1edc1..413532826b 100644
--- a/actionview/lib/action_view/helpers/asset_tag_helper.rb
+++ b/actionview/lib/action_view/helpers/asset_tag_helper.rb
@@ -149,12 +149,12 @@ module ActionView
       # ==== Options
       #
       # * <tt>:rel</tt>   - Specify the relation of this link, defaults to 'shortcut icon'
-      # * <tt>:type</tt>  - Override the auto-generated mime type, defaults to 'image/vnd.microsoft.icon'
+      # * <tt>:type</tt>  - Override the auto-generated mime type, defaults to 'image/x-icon'
       #
       # ==== Examples
       #
       #   favicon_link_tag 'myicon.ico'
-      #   # => <link href="/assets/myicon.ico" rel="shortcut icon" type="image/vnd.microsoft.icon" />
+      #   # => <link href="/assets/myicon.ico" rel="shortcut icon" type="image/x-icon" />
       #
       # Mobile Safari looks for a different <link> tag, pointing to an image that
       # will be used if you add the page to the home screen of an iPod Touch, iPhone, or iPad.
@@ -165,7 +165,7 @@ module ActionView
       def favicon_link_tag(source='favicon.ico', options={})
         tag('link', {
           :rel  => 'shortcut icon',
-          :type => 'image/vnd.microsoft.icon',
+          :type => 'image/x-icon',
           :href => path_to_image(source)
         }.merge!(options.symbolize_keys))
       end
-- 
cgit v1.2.3