From 9660360d6b48574c558110758be1e42c01333343 Mon Sep 17 00:00:00 2001 From: Michael Koziarski Date: Fri, 28 Sep 2007 20:57:39 +0000 Subject: Re-enable Routing optimisation code for _url methods, add defined?(request) to the guard conditions git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7673 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_controller/routing_optimisation.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'actionpack/lib/action_controller/routing_optimisation.rb') diff --git a/actionpack/lib/action_controller/routing_optimisation.rb b/actionpack/lib/action_controller/routing_optimisation.rb index 71cfcbd935..b1bf3916d6 100644 --- a/actionpack/lib/action_controller/routing_optimisation.rb +++ b/actionpack/lib/action_controller/routing_optimisation.rb @@ -44,7 +44,7 @@ module ActionController # Temporarily disabled :url optimisation pending proper solution to # Issues around request.host etc. def applicable? - kind != :url + true end end @@ -60,9 +60,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 - "args.size == 1 && !args.first.is_a?(Hash)" + "defined?(request) && args.size == 1 && !args.first.is_a?(Hash)" else - "args.size == #{number_of_arguments}" + "defined?(request) && args.size == #{number_of_arguments}" end end @@ -97,7 +97,7 @@ module ActionController # argument class PositionalArgumentsWithAdditionalParams < PositionalArguments def guard_condition - "args.size == #{route.segment_keys.size + 1}" + "defined?(request) && args.size == #{route.segment_keys.size + 1}" end # This case uses almost the Use the same code as positional arguments, -- cgit v1.2.3