提交 d4269db8 编写于 作者: R Rafael Mendonça França

Merge pull request #10120 from vipulnsward/change_merge_on_new_hash

change some more merge to merge! on new hashes
......@@ -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
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册