From 8f4cf26d694587ff10ec25e07c3af1382513c47e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Thu, 5 Apr 2012 14:30:44 -0300 Subject: Fix url_for when options is nil RouteSet#url_for was modifying the options hash that belong to the caller --- actionpack/lib/action_dispatch/routing/route_set.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionpack/lib/action_dispatch/routing/route_set.rb') diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb index 30e9e5634b..99abf4c1cf 100644 --- a/actionpack/lib/action_dispatch/routing/route_set.rb +++ b/actionpack/lib/action_dispatch/routing/route_set.rb @@ -606,7 +606,7 @@ module ActionDispatch end def url_for(options) - options = (options || {}).reverse_merge!(default_url_options) + options = default_url_options.merge(options || {}) handle_positional_args(options) -- cgit v1.2.3