From 6871bd9818a9a7d9d8c7e21e253d64c0410fde1d Mon Sep 17 00:00:00 2001 From: Santiago Pastorino Date: Wed, 20 Feb 2013 15:47:56 -0200 Subject: [PATCH] Revert "Merge pull request #4803 from lucascaton/master" This reverts commit bb842e8d2111e50b21a14b8bd6d89371a4b9cd68, reversing changes made to 40c287c7983c20c498f6a8a2ea49e9a6455347f7. This was causing issues in one of our apps we just upgraded. ActionController::RoutingError: No route matches [GET] "/images/favicon.ico" favicon_link_tag now returns '/images/favicon.ico' and in 3.2 returned '/favicon.ico' Browsers by default look for favicon.ico in the root directory Conflicts: actionpack/CHANGELOG.md actionpack/lib/action_view/helpers/asset_tag_helper.rb --- actionpack/CHANGELOG.md | 2 -- actionpack/lib/action_view/helpers/asset_tag_helper.rb | 4 ++-- actionpack/test/template/asset_tag_helper_test.rb | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index b9bff4958f779..1a0060c911151 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1019,8 +1019,6 @@ not submitted with the form. This is a behavior change, previously the hidden tag had a value of the disabled checkbox. *Tadas Tamosauskas* -* `favicon_link_tag` helper will now use the favicon in app/assets by default. *Lucas Caton* - * `ActionView::Helpers::TextHelper#highlight` now defaults to the HTML5 `mark` element. *Brian Cardarella* diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb index 31e37893c6eb3..bf78c00e4d1bf 100644 --- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb +++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb @@ -152,7 +152,7 @@ def auto_discovery_link_tag(type = :rss, url_options = {}, tag_options = {}) # * :type - Override the auto-generated mime type, defaults to 'image/vnd.microsoft.icon' # # favicon_link_tag '/myicon.ico' - # # => + # # => # # Mobile Safari looks for a different 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. @@ -161,7 +161,7 @@ def auto_discovery_link_tag(type = :rss, url_options = {}, tag_options = {}) # favicon_link_tag '/mb-icon.png', rel: 'apple-touch-icon', type: 'image/png' # # => # - def favicon_link_tag(source='favicon.ico', options={}) + def favicon_link_tag(source='/favicon.ico', options={}) tag('link', { :rel => 'shortcut icon', :type => 'image/vnd.microsoft.icon', diff --git a/actionpack/test/template/asset_tag_helper_test.rb b/actionpack/test/template/asset_tag_helper_test.rb index 11614a45dc513..185f742c7ff2e 100644 --- a/actionpack/test/template/asset_tag_helper_test.rb +++ b/actionpack/test/template/asset_tag_helper_test.rb @@ -200,7 +200,7 @@ def url_for(*args) } FaviconLinkToTag = { - %(favicon_link_tag) => %(), + %(favicon_link_tag) => %(), %(favicon_link_tag 'favicon.ico') => %(), %(favicon_link_tag 'favicon.ico', :rel => 'foo') => %(), %(favicon_link_tag 'favicon.ico', :rel => 'foo', :type => 'bar') => %(),