From a1e795f554e07476f1084a0c76cb8b033d1d0b0c Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Wed, 21 Jul 2010 20:59:05 -0300
Subject: 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

---
 actionpack/lib/action_dispatch/routing/route_set.rb | 2 +-
 actionpack/lib/action_dispatch/routing/url_for.rb   | 2 +-
 actionpack/lib/action_view/helpers/url_helper.rb    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index a9b97a17eb..77688fe397 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -454,7 +454,7 @@ module ActionDispatch
 
       def url_for(options)
         finalize!
-        options = default_url_options.merge(options || {})
+        options = (options || {}).reverse_merge!(default_url_options)
 
         handle_positional_args(options)
 
diff --git a/actionpack/lib/action_dispatch/routing/url_for.rb b/actionpack/lib/action_dispatch/routing/url_for.rb
index 662eb05c26..9b42f26289 100644
--- a/actionpack/lib/action_dispatch/routing/url_for.rb
+++ b/actionpack/lib/action_dispatch/routing/url_for.rb
@@ -129,7 +129,7 @@ module ActionDispatch
         when String
           options
         when nil, Hash
-          _routes.url_for(url_options.merge((options || {}).symbolize_keys))
+          _routes.url_for((options || {}).reverse_merge!(url_options).symbolize_keys)
         else
           polymorphic_url(options)
         end
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()'
-- 
cgit v1.2.3