diff options
| author | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-06-15 11:59:28 -0700 |
|---|---|---|
| committer | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-06-15 11:59:28 -0700 |
| commit | 5314abed182450dbdcc25ebe601a2bbdf4cb926f (patch) | |
| tree | 83d98fc8fa038ca525aecf4c4d293ae678ff2e99 /actionmailer | |
| parent | 80d1e2778860d1825d749aad274e70e0ea810bc6 (diff) | |
| download | rails-5314abed182450dbdcc25ebe601a2bbdf4cb926f.tar.gz rails-5314abed182450dbdcc25ebe601a2bbdf4cb926f.tar.bz2 rails-5314abed182450dbdcc25ebe601a2bbdf4cb926f.zip | |
Keep ActionMailer using the old layouts code until it gets refactored.
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 4 |
1 files changed, 3 insertions, 1 deletions
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: |