diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2004-12-15 11:30:09 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2004-12-15 11:30:09 +0000 |
| commit | 4d9cda5732538e9cdb325b2ffa7f9e97f8ac2ec0 (patch) | |
| tree | b00a149a047e97b978be9bcbcfe5b9e4b02ec0d5 /railties/lib/dispatcher.rb | |
| parent | a02a96226e08557ba6abf70fa80168fe512b8f93 (diff) | |
| download | rails-4d9cda5732538e9cdb325b2ffa7f9e97f8ac2ec0.tar.gz rails-4d9cda5732538e9cdb325b2ffa7f9e97f8ac2ec0.tar.bz2 rails-4d9cda5732538e9cdb325b2ffa7f9e97f8ac2ec0.zip | |
Renamed AbstractApplicationController and abstract_application.rb to ApplicationController and application.rb, so that it will be possible for the framework to automatically pick up on app/views/layouts/application.rhtml and app/helpers/application.rb
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@159 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties/lib/dispatcher.rb')
| -rw-r--r-- | railties/lib/dispatcher.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/dispatcher.rb b/railties/lib/dispatcher.rb index abb686a469..ceb88f30ba 100644 --- a/railties/lib/dispatcher.rb +++ b/railties/lib/dispatcher.rb @@ -35,7 +35,7 @@ class Dispatcher controller_name, module_name = controller_name(request.parameters), module_name(request.parameters) - require_dependency("abstract_application") + require_dependency("application") require_dependency(controller_path(controller_name, module_name)) controller_class(controller_name).process(request, response).out @@ -43,7 +43,7 @@ class Dispatcher ActionController::Base.process_with_exception(request, response, exception).out ensure if ActionController::Base.reload_dependencies - Object.send(:remove_const, "AbstractApplicationController") if Object.const_defined?(:AbstractApplicationController) + Object.send(:remove_const, "ApplicationController") if Object.const_defined?(:ApplicationController) Object.send(:remove_const, controller_class_name(controller_name)) if Object.const_defined?(controller_class_name(controller_name)) ActiveRecord::Base.reset_associations_loaded ActiveRecord::Base.reset_column_information_and_inheritable_attributes_for_all_subclasses |