diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-04-05 14:30:44 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-04-05 15:12:42 -0300 |
| commit | 8f4cf26d694587ff10ec25e07c3af1382513c47e (patch) | |
| tree | 55fc37891744a965ffdb53e65b8e79f7cd11236e /actionpack/lib/action_dispatch | |
| parent | 163258ba2a7ff325cb79d70a1ad15aeb3d270e28 (diff) | |
| download | rails-8f4cf26d694587ff10ec25e07c3af1382513c47e.tar.gz rails-8f4cf26d694587ff10ec25e07c3af1382513c47e.tar.bz2 rails-8f4cf26d694587ff10ec25e07c3af1382513c47e.zip | |
Fix url_for when options is nil
RouteSet#url_for was modifying the options hash that belong to the
caller
Diffstat (limited to 'actionpack/lib/action_dispatch')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/route_set.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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) |