diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-08-12 15:54:33 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-08-12 15:54:33 -0700 |
| commit | c420ebf74a70e40efdfe8e8860e582fbb7dc9d13 (patch) | |
| tree | 24b81937648936fb4dc29e00b3a220d8fb5a6cc0 /actionpack | |
| parent | d1f1b04386cb50521128b3e44630f704bb738194 (diff) | |
| parent | 8196c842b6f32271c23cba6b97918d32747018d8 (diff) | |
| download | rails-c420ebf74a70e40efdfe8e8860e582fbb7dc9d13.tar.gz rails-c420ebf74a70e40efdfe8e8860e582fbb7dc9d13.tar.bz2 rails-c420ebf74a70e40efdfe8e8860e582fbb7dc9d13.zip | |
Merge pull request #2503 from arunagw/cant_dup_on_nil
We cannot dup on nil.
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/url_for.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/routing/url_for.rb b/actionpack/lib/action_dispatch/routing/url_for.rb index 5d354b0fb8..de14113c51 100644 --- a/actionpack/lib/action_dispatch/routing/url_for.rb +++ b/actionpack/lib/action_dispatch/routing/url_for.rb @@ -140,7 +140,7 @@ module ActionDispatch when String options when nil, Hash - _routes.url_for((options.dup || {}).reverse_merge!(url_options).symbolize_keys) + _routes.url_for((options || {}).reverse_merge(url_options).symbolize_keys) else polymorphic_url(options) end |