aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2010-07-21 20:59:05 -0300
committerJeremy Kemper <jeremy@bitsweat.net>2010-07-21 17:34:02 -0700
commita1e795f554e07476f1084a0c76cb8b033d1d0b0c (patch)
treec3060a8d0eebb91eb5456b8fd88478b65f9f00d4 /actionpack/lib/action_view
parenta78547a9c66eeaa3dbf5e2612483ca172fb137e9 (diff)
downloadrails-a1e795f554e07476f1084a0c76cb8b033d1d0b0c.tar.gz
rails-a1e795f554e07476f1084a0c76cb8b033d1d0b0c.tar.bz2
rails-a1e795f554e07476f1084a0c76cb8b033d1d0b0c.zip
options could be of any kind of Hash (Hash, HashWithIndifferentAccess or OrderedHash) this way we keep the properties of the options passed as an argument
Diffstat (limited to 'actionpack/lib/action_view')
-rw-r--r--actionpack/lib/action_view/helpers/url_helper.rb2
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 b493a0cb0e..a5c6718c58 100644
--- a/actionpack/lib/action_view/helpers/url_helper.rb
+++ b/actionpack/lib/action_view/helpers/url_helper.rb
@@ -95,7 +95,7 @@ module ActionView
when String
options
when Hash
- options = { :only_path => options[:host].nil? }.update(options.symbolize_keys)
+ options = options.symbolize_keys.reverse_merge!(:only_path => options[:host].nil?)
super
when :back
controller.request.env["HTTP_REFERER"] || 'javascript:history.back()'