diff options
| author | Xavier Noria <fxn@hashref.com> | 2012-04-05 11:44:17 -0700 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2012-04-05 11:44:17 -0700 |
| commit | e535faaee7bf0c01102ef29d2d396063604ab9d9 (patch) | |
| tree | 6c0983ea3adfd12569c99d7dd90551124981ddd5 /actionpack/lib/action_dispatch/routing/route_set.rb | |
| parent | ca879d203be8dff52f7d41e3b08d668935304223 (diff) | |
| parent | ddbd1e4adbbdcbb6602839fbfd4ebe646393ce64 (diff) | |
| download | rails-e535faaee7bf0c01102ef29d2d396063604ab9d9.tar.gz rails-e535faaee7bf0c01102ef29d2d396063604ab9d9.tar.bz2 rails-e535faaee7bf0c01102ef29d2d396063604ab9d9.zip | |
Merge pull request #5751 from rafaelfranca/fix-build
Fix url_for when options is nil
Diffstat (limited to 'actionpack/lib/action_dispatch/routing/route_set.rb')
| -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) |