diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-26 02:05:53 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-26 02:05:53 -0800 |
| commit | 133c349b0af1c46d26f83c19e6b583062db931e4 (patch) | |
| tree | 7b4a02ea90b09a2ad90ae013d5880e56e397611c /actionpack/lib/action_controller/routing/optimisations.rb | |
| parent | a88094fd7a19a4b2d5c5b5044b10146e6c5c7245 (diff) | |
| parent | fef6c32afe2276dffa0347e25808a86e7a101af1 (diff) | |
| download | rails-133c349b0af1c46d26f83c19e6b583062db931e4.tar.gz rails-133c349b0af1c46d26f83c19e6b583062db931e4.tar.bz2 rails-133c349b0af1c46d26f83c19e6b583062db931e4.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_controller/routing/optimisations.rb')
| -rw-r--r-- | actionpack/lib/action_controller/routing/optimisations.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/routing/optimisations.rb b/actionpack/lib/action_controller/routing/optimisations.rb index 4522ebcb1a..714cf97861 100644 --- a/actionpack/lib/action_controller/routing/optimisations.rb +++ b/actionpack/lib/action_controller/routing/optimisations.rb @@ -65,7 +65,7 @@ module ActionController # rather than triggering the expensive logic in +url_for+. class PositionalArguments < Optimiser def guard_conditions - number_of_arguments = route.segment_keys.size + number_of_arguments = route.required_segment_keys.size # if they're using foo_url(:id=>2) it's one # argument, but we don't want to generate /foos/id2 if number_of_arguments == 1 |