diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
index 1ca95b7dd1..47abf1e41c 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
@@ -518,24 +518,30 @@ module ActionView
#
#
# The helper accepts an additional options hash where you can override "rel" and "type".
- def favicon_link_tag(source=nil, options={})
+ def favicon_link_tag(source='/favicon.ico', options={})
tag('link', {
:rel => 'shortcut icon',
:type => 'image/vnd.microsoft.icon',
- :href => image_path(source || '/favicon.ico')
+ :href => image_path(source)
}.merge(options.symbolize_keys))
end
# Returns a link tag for an icon targetted at iPod Touch, iPhone, and iPad.
#
- # <%= apple_touch_icon_link_tag 'my_site.png' %>
+ # <%= apple_touch_icon_link_tag %>
#
# generates
#
- #
+ #
#
- # The source argument is passed to +image_path+ as is.
- def apple_touch_icon_link_tag(source)
+ # You can specify a different icon file:
+ #
+ # <%= apple_touch_icon_link_tag "my_site.png" %>
+ #
+ # That's passed to +image_path+ as is, so the example above would render
+ #
+ #
+ def apple_touch_icon_link_tag(source='/apple-touch-icon.png')
tag('link', :rel => 'apple-touch-icon', :href => image_path(source))
end
diff --git a/actionpack/test/template/asset_tag_helper_test.rb b/actionpack/test/template/asset_tag_helper_test.rb
index 71052fb22c..10ee9c7881 100644
--- a/actionpack/test/template/asset_tag_helper_test.rb
+++ b/actionpack/test/template/asset_tag_helper_test.rb
@@ -165,6 +165,7 @@ class AssetTagHelperTest < ActionView::TestCase
}
AppleTouchIconLinkToTag = {
+ %(apple_touch_icon_link_tag) => %(),
%(apple_touch_icon_link_tag 'my_site.png') => %()
}