diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2005-03-25 09:07:01 +0000 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-03-25 09:07:01 +0000 |
commit | 45137795e8db0c47c0bc16712b0a24807459e252 (patch) | |
tree | d6edb02c996e43e638cf0e473adaa6ac61321976 /actionpack/lib/action_controller/dependencies.rb | |
parent | a5c694283010c05ee39bc0757e8013b3aa382992 (diff) | |
download | rails-45137795e8db0c47c0bc16712b0a24807459e252.tar.gz rails-45137795e8db0c47c0bc16712b0a24807459e252.tar.bz2 rails-45137795e8db0c47c0bc16712b0a24807459e252.zip |
Fixed that MissingSourceFile's wasn't properly detected in production mode #925 [Nicholas Seckar]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@990 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/dependencies.rb')
-rw-r--r-- | actionpack/lib/action_controller/dependencies.rb | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/actionpack/lib/action_controller/dependencies.rb b/actionpack/lib/action_controller/dependencies.rb index 7fb72417c0..2960330afa 100644 --- a/actionpack/lib/action_controller/dependencies.rb +++ b/actionpack/lib/action_controller/dependencies.rb @@ -82,14 +82,6 @@ module ActionController #:nodoc: def inherited(child) inherited_without_model(child) - return if child.controller_name == "application" # otherwise the ApplicationController in Rails will include itself - model_name = child.controller_name.singularize - begin - require_dependency model_name - child.model model_name - rescue MissingSourceFile => e - raise unless e.path == model_name + '.rb' - end end end end |