diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-04-22 01:13:14 -0500 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-04-22 01:13:14 -0500 |
| commit | 99613f01d30f4ab8d4328cd669147e9cb2b8442f (patch) | |
| tree | 55fb982289c23e8dab1adb04d7b673319bf8f1b5 /actionview/lib/action_view | |
| parent | 0303d3a4bdf9090edd0167e22106fb105bd93cd8 (diff) | |
| parent | c8b7ad1cc5f67b114d1b491dff4bd661b88df81d (diff) | |
| download | rails-99613f01d30f4ab8d4328cd669147e9cb2b8442f.tar.gz rails-99613f01d30f4ab8d4328cd669147e9cb2b8442f.tar.bz2 rails-99613f01d30f4ab8d4328cd669147e9cb2b8442f.zip | |
Merge pull request #13335 from glorieux/favicon_link_tag_mimetype
Change favicon_link_tag helper mimetype from image/vnd.microsoft.icon to image/x-icon.
Diffstat (limited to 'actionview/lib/action_view')
| -rw-r--r-- | actionview/lib/action_view/helpers/asset_tag_helper.rb | 6 |
1 files changed, 3 insertions, 3 deletions
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 |