Changeset 7676
- Timestamp:
- 09/29/07 02:19:16 (1 year ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/actionpack/lib/action_controller/routing_optimisation.rb
r7673 r7676 61 61 # argument, but we don't want to generate /foos/id2 62 62 if number_of_arguments == 1 63 "defined?(request) && args.size == 1 && !args.first.is_a?(Hash)"63 "defined?(request) && request && args.size == 1 && !args.first.is_a?(Hash)" 64 64 else 65 "defined?(request) && args.size == #{number_of_arguments}"65 "defined?(request) && request && args.size == #{number_of_arguments}" 66 66 end 67 67 end … … 76 76 end 77 77 78 elements << '#{request.relative_url_root if request && request.relative_url_root}'78 elements << '#{request.relative_url_root if request.relative_url_root}' 79 79 80 80 # The last entry in route.segments appears to # *always* be a … … 98 98 class PositionalArgumentsWithAdditionalParams < PositionalArguments 99 99 def guard_condition 100 "defined?(request) && args.size == #{route.segment_keys.size + 1}"100 "defined?(request) && request && args.size == #{route.segment_keys.size + 1}" 101 101 end 102 102
