diff options
| author | Andrew White <pixeltrix@users.noreply.github.com> | 2015-01-29 11:22:26 +0000 |
|---|---|---|
| committer | Andrew White <pixeltrix@users.noreply.github.com> | 2015-01-29 11:22:26 +0000 |
| commit | 069b72aaf04d2caef76f8e71f320716129f2d949 (patch) | |
| tree | ab8d7309d4110ea01291d46860e44f62130b122d /actionpack/lib/action_dispatch/routing/route_set.rb | |
| parent | de3d61518366e2b8b77646ceb01b396d517aa68d (diff) | |
| parent | db870f222e7ba4402590ee2f4143bcd40c3dbc56 (diff) | |
| download | rails-069b72aaf04d2caef76f8e71f320716129f2d949.tar.gz rails-069b72aaf04d2caef76f8e71f320716129f2d949.tar.bz2 rails-069b72aaf04d2caef76f8e71f320716129f2d949.zip | |
Merge pull request #18627 from tekin/dont-blat-default-format
Preserve default format when generating URLs
Diffstat (limited to 'actionpack/lib/action_dispatch/routing/route_set.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/route_set.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb index 7d8863dfe5..2b24b896db 100644 --- a/actionpack/lib/action_dispatch/routing/route_set.rb +++ b/actionpack/lib/action_dispatch/routing/route_set.rb @@ -264,9 +264,10 @@ module ActionDispatch path_params -= controller_options.keys path_params -= result.keys end - path_params.each { |param| - result[param] = inner_options.fetch(param) { args.shift } - } + path_params -= inner_options.keys + path_params.take(args.size).each do |param| + result[param] = args.shift + end end result.merge!(inner_options) |