diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-02-11 13:03:34 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-02-11 13:03:34 +0000 |
| commit | 66b504b1f7791f7ac9ba35e021660f9c18f972b7 (patch) | |
| tree | 66a59ab85ef37d0d60289a42ddce8cd732bfb787 /actionpack | |
| parent | 02d0558738b0c24663404f9b14398fc920f0f60f (diff) | |
| download | rails-66b504b1f7791f7ac9ba35e021660f9c18f972b7.tar.gz rails-66b504b1f7791f7ac9ba35e021660f9c18f972b7.tar.bz2 rails-66b504b1f7791f7ac9ba35e021660f9c18f972b7.zip | |
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
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_controller/dependencies.rb | 1 |
1 files changed, 0 insertions, 1 deletions
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 |