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
This commit is contained in:
parent
02d0558738
commit
66b504b1f7
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue