Browse files

Merge pull request #10120 from vipulnsward/change_merge_on_new_hash

change some more merge to merge! on new hashes
  • Loading branch information...
2 parents 5758387 + defea35 commit d4269db86a4e27c3a3a28c5015826c83f465ce7f @rafaelfranca rafaelfranca committed Apr 6, 2013
Showing with 3 additions and 3 deletions.
  1. +3 −3 actionpack/lib/action_view/helpers/asset_tag_helper.rb
View
6 actionpack/lib/action_view/helpers/asset_tag_helper.rb
@@ -58,7 +58,7 @@ def javascript_include_tag(*sources)
sources.uniq.map { |source|
tag_options = {
"src" => path_to_javascript(source, path_options)
- }.merge(options)
+ }.merge!(options)
content_tag(:script, "", tag_options)
}.join("\n").html_safe
end
@@ -98,7 +98,7 @@ def stylesheet_link_tag(*sources)
"rel" => "stylesheet",
"media" => "screen",
"href" => path_to_stylesheet(source, path_options)
- }.merge(options)
+ }.merge!(options)
tag(:link, tag_options)
}.join("\n").html_safe
end
@@ -166,7 +166,7 @@ def favicon_link_tag(source='favicon.ico', options={})
:rel => 'shortcut icon',
:type => 'image/vnd.microsoft.icon',
:href => path_to_image(source)
- }.merge(options.symbolize_keys))
+ }.merge!(options.symbolize_keys))
end
# Returns an HTML image tag for the +source+. The +source+ can be a full

0 comments on commit d4269db

Please sign in to comment.