From f31291ab5a5d928f7f73f32fa9f2261c1f446476 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Mon, 24 Jan 2005 00:26:44 +0000 Subject: Another swing at reloading git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@479 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_controller/dependencies.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'actionpack') diff --git a/actionpack/lib/action_controller/dependencies.rb b/actionpack/lib/action_controller/dependencies.rb index e1ede3d42a..6b43a3a57f 100644 --- a/actionpack/lib/action_controller/dependencies.rb +++ b/actionpack/lib/action_controller/dependencies.rb @@ -78,8 +78,9 @@ module ActionController #:nodoc: inherited_without_model(child) return if child.controller_name == "application" # otherwise the ApplicationController in Rails will include itself begin - child.model(Inflector.singularize(child.controller_name)) - rescue LoadError + 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 end end -- cgit v1.2.3