From aa749a74f63547a503772f4489fb60b5e4fbea1a Mon Sep 17 00:00:00 2001 From: Carlhuda Date: Tue, 2 Mar 2010 14:00:17 -0800 Subject: Get the railties tests to pass again. --- railties/lib/rails/engine.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'railties/lib') 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| -- cgit v1.2.3