diff options
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_controller/dependencies.rb | 5 |
1 files changed, 3 insertions, 2 deletions
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 |