diff options
| author | Michael Koziarski <michael@koziarski.com> | 2008-05-06 20:53:56 +1200 |
|---|---|---|
| committer | Michael Koziarski <michael@koziarski.com> | 2008-05-06 20:53:56 +1200 |
| commit | a08004a9a7d4c93c39f9693f6406ecb70d6a38c0 (patch) | |
| tree | 531584bf588a3b288ab14a8e16540ab947a0ec45 /actionpack/lib/action_controller/routing | |
| parent | c26d10563eaa29961ae895a9fbe3afae7d24a9b1 (diff) | |
| parent | 04f52219f11944e50555dc59917c73c99581dac0 (diff) | |
| download | rails-a08004a9a7d4c93c39f9693f6406ecb70d6a38c0.tar.gz rails-a08004a9a7d4c93c39f9693f6406ecb70d6a38c0.tar.bz2 rails-a08004a9a7d4c93c39f9693f6406ecb70d6a38c0.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_controller/routing')
| -rw-r--r-- | actionpack/lib/action_controller/routing/optimisations.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/routing/optimisations.rb b/actionpack/lib/action_controller/routing/optimisations.rb index 3e3a2225f0..cd4a423e6b 100644 --- a/actionpack/lib/action_controller/routing/optimisations.rb +++ b/actionpack/lib/action_controller/routing/optimisations.rb @@ -61,9 +61,9 @@ module ActionController # 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 - "(!defined?(default_url_options) || default_url_options(nil).blank?) && defined?(request) && request && args.size == 1 && !args.first.is_a?(Hash)" + "(!defined?(default_url_options) || default_url_options.blank?) && defined?(request) && request && args.size == 1 && !args.first.is_a?(Hash)" else - "(!defined?(default_url_options) || default_url_options(nil).blank?) && defined?(request) && request && args.size == #{number_of_arguments}" + "(!defined?(default_url_options) || default_url_options.blank?) && defined?(request) && request && args.size == #{number_of_arguments}" end end @@ -98,7 +98,7 @@ module ActionController # argument class PositionalArgumentsWithAdditionalParams < PositionalArguments def guard_condition - "(!defined?(default_url_options) || default_url_options(nil).blank?) && defined?(request) && request && args.size == #{route.segment_keys.size + 1} && !args.last.has_key?(:anchor) && !args.last.has_key?(:port) && !args.last.has_key?(:host)" + "(!defined?(default_url_options) || default_url_options.blank?) && defined?(request) && request && args.size == #{route.segment_keys.size + 1} && !args.last.has_key?(:anchor) && !args.last.has_key?(:port) && !args.last.has_key?(:host)" end # This case uses almost the same code as positional arguments, |