aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/engine.rb
diff options
context:
space:
mode:
authorCarlhuda <carlhuda@engineyard.com>2010-03-02 14:00:17 -0800
committerCarlhuda <carlhuda@engineyard.com>2010-03-02 14:00:25 -0800
commitaa749a74f63547a503772f4489fb60b5e4fbea1a (patch)
tree416b05fddbccd1a0bc56fa257ec5eb6c7339fb50 /railties/lib/rails/engine.rb
parentecfd6d90eeeeeffb7415b4d9316da4e0bc35743b (diff)
downloadrails-aa749a74f63547a503772f4489fb60b5e4fbea1a.tar.gz
rails-aa749a74f63547a503772f4489fb60b5e4fbea1a.tar.bz2
rails-aa749a74f63547a503772f4489fb60b5e4fbea1a.zip
Get the railties tests to pass again.
Diffstat (limited to 'railties/lib/rails/engine.rb')
-rw-r--r--railties/lib/rails/engine.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index 07218dcfa8..79183480a3 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -97,8 +97,8 @@ module Rails
initializer :add_view_paths do
views = paths.app.views.to_a
- ActionController::Base.prepend_view_path(views) if defined?(ActionController)
- ActionMailer::Base.prepend_view_path(views) if defined?(ActionMailer)
+ ActionController::Base.prepend_view_path(views) if defined?(ActionController::Base)
+ ActionMailer::Base.prepend_view_path(views) if defined?(ActionMailer::Base)
end
initializer :add_metals do |app|