aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2004-12-08 10:41:14 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2004-12-08 10:41:14 +0000
commit4e1eaa289b8e410277a8dfb9a0c5139cafcbb23e (patch)
treedc89234dcff95d5f77b0ab433d3dacac78ec2b51 /railties/lib
parent554597d65781638094ff8552cb65eb802517e8ce (diff)
downloadrails-4e1eaa289b8e410277a8dfb9a0c5139cafcbb23e.tar.gz
rails-4e1eaa289b8e410277a8dfb9a0c5139cafcbb23e.tar.bz2
rails-4e1eaa289b8e410277a8dfb9a0c5139cafcbb23e.zip
Only nuke the AbstractApplicationController if its available
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@79 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/dispatcher.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/dispatcher.rb b/railties/lib/dispatcher.rb
index 49bdd093c4..680b03fb42 100644
--- a/railties/lib/dispatcher.rb
+++ b/railties/lib/dispatcher.rb
@@ -41,7 +41,7 @@ class Dispatcher
ActiveRecord::Base.reset_associations_loaded
if ActionController::Base.reload_dependencies
- Object.send(:remove_const, "AbstractApplicationController")
+ Object.send(:remove_const, "AbstractApplicationController") if Object.const_defined?(:AbstractApplicationController)
Object.send(:remove_const, controller_class_name(controller_name)) if Object.const_defined?(controller_class_name(controller_name))
end
end