Skip to content

Commit

Permalink
Fixed double requiring of models with the same name as the controller
Browse files Browse the repository at this point in the history
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@579 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information
dhh committed Feb 11, 2005
1 parent 02d0558 commit 66b504b
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion actionpack/lib/action_controller/dependencies.rb
Expand Up @@ -78,7 +78,6 @@ def inherited(child)
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
Expand Down

0 comments on commit 66b504b

Please sign in to comment.