From 87bed3af479c4df720304fea21a9a14d34eb4544 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 10 Apr 2005 15:01:35 +0000 Subject: Fixed that in some circumstances controllers outside of modules may have hidden ones inside modules. For example, admin/content might have been hidden by /content. #1075 [Nicholas Seckar] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1125 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_controller/routing.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionpack/lib/action_controller') diff --git a/actionpack/lib/action_controller/routing.rb b/actionpack/lib/action_controller/routing.rb index 28d692aa5b..406c6acb75 100644 --- a/actionpack/lib/action_controller/routing.rb +++ b/actionpack/lib/action_controller/routing.rb @@ -162,7 +162,7 @@ module ActionController name = name.camelize return nil, nil unless /^[A-Z][_a-zA-Z\d]*$/ =~ name controller_name = name + "Controller" - return mod.const_get(controller_name), path[length..-1] if mod.const_available? controller_name + return eval("mod::#{controller_name}"), path[length..-1] if mod.const_available? controller_name return nil, nil unless mod.const_available? name [mod.const_get(name), length + 1] end -- cgit v1.2.3