diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2012-05-14 17:51:54 -0300 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2012-05-14 17:52:11 -0300 |
| commit | 2c0add7103e967a7de2df42675eb49e093327c58 (patch) | |
| tree | afa9b5a137cddfa8b6e21e9f43dc939eb908ce90 /actionpack/lib | |
| parent | 683fc4db00f496e5225928afb4d4e932e0fcdc48 (diff) | |
| download | rails-2c0add7103e967a7de2df42675eb49e093327c58.tar.gz rails-2c0add7103e967a7de2df42675eb49e093327c58.tar.bz2 rails-2c0add7103e967a7de2df42675eb49e093327c58.zip | |
Use merge! instead reverse_merge! here
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_view/helpers/url_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/url_helper.rb b/actionpack/lib/action_view/helpers/url_helper.rb index 31ab0d858a..7e69547dab 100644 --- a/actionpack/lib/action_view/helpers/url_helper.rb +++ b/actionpack/lib/action_view/helpers/url_helper.rb @@ -108,7 +108,7 @@ module ActionView options when nil, Hash options ||= {} - options = options.symbolize_keys.reverse_merge!(:only_path => options[:host].nil?) + options = { :only_path => options[:host].nil? }.merge!(options.symbolize_keys) super when :back controller.request.env["HTTP_REFERER"] || 'javascript:history.back()' |