diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-05-13 14:19:23 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-05-13 14:19:31 -0700 |
| commit | 567aa5440e3030161cb9dd0864909f1ccce60f72 (patch) | |
| tree | 19cb019154457ecff18977969c1bf24f1f33c171 /actionpack | |
| parent | 595326647405282e9edc6754019945896b1f2fc5 (diff) | |
| download | rails-567aa5440e3030161cb9dd0864909f1ccce60f72.tar.gz rails-567aa5440e3030161cb9dd0864909f1ccce60f72.tar.bz2 rails-567aa5440e3030161cb9dd0864909f1ccce60f72.zip | |
options should always be passed to url_for
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/route_set.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb index 76d193244e..f0c0810a3c 100644 --- a/actionpack/lib/action_dispatch/routing/route_set.rb +++ b/actionpack/lib/action_dispatch/routing/route_set.rb @@ -645,9 +645,9 @@ module ActionDispatch nil end - # The +options+ argument must be +nil+ or a hash whose keys are *symbols*. + # The +options+ argument must be a hash whose keys are *symbols*. def url_for(options) - options = default_url_options.merge(options || {}) + options = default_url_options.merge options user = password = nil |