From 5314abed182450dbdcc25ebe601a2bbdf4cb926f Mon Sep 17 00:00:00 2001 From: Yehuda Katz + Carl Lerche Date: Mon, 15 Jun 2009 11:59:28 -0700 Subject: Keep ActionMailer using the old layouts code until it gets refactored. --- actionmailer/lib/action_mailer/base.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'actionmailer/lib/action_mailer') diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index a33302a222..8054d78a90 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -1,4 +1,6 @@ require "active_support/core_ext/class" +# Use the old layouts until actionmailer gets refactored +require "action_controller/old_base/layout" module ActionMailer #:nodoc: # Action Mailer allows you to send email from your application using a mailer model and views. @@ -250,7 +252,7 @@ module ActionMailer #:nodoc: include AdvAttrAccessor, PartContainer, Quoting, Utils if Object.const_defined?(:ActionController) include ActionController::UrlWriter - include ActionController::Layouts + include ActionController::Layout end private_class_method :new #:nodoc: -- cgit v1.2.3