From 66b504b1f7791f7ac9ba35e021660f9c18f972b7 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Fri, 11 Feb 2005 13:03:34 +0000 Subject: Fixed double requiring of models with the same name as the controller git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@579 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_controller/dependencies.rb | 1 - 1 file changed, 1 deletion(-) (limited to 'actionpack/lib/action_controller/dependencies.rb') diff --git a/actionpack/lib/action_controller/dependencies.rb b/actionpack/lib/action_controller/dependencies.rb index 6b43a3a57f..8bc013db66 100644 --- a/actionpack/lib/action_controller/dependencies.rb +++ b/actionpack/lib/action_controller/dependencies.rb @@ -78,7 +78,6 @@ module ActionController #:nodoc: inherited_without_model(child) return if child.controller_name == "application" # otherwise the ApplicationController in Rails will include itself begin - Object.const_get(child.controller_name.singularize.classify) child.model(child.controller_name.singularize) rescue NameError, LoadError # No neither singular or plural model available for this controller -- cgit v1.2.3