diff options
| author | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-06-15 11:44:45 -0700 |
|---|---|---|
| committer | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-06-15 11:44:45 -0700 |
| commit | a63caa4c0c2a8aabc13c354a9193ebd9c5e8ba73 (patch) | |
| tree | 3d90ed4e56055eb4f4a7b7760321007586b3c87c /actionmailer | |
| parent | 614374b3e5b19b737175a82c6dad2f146800eef1 (diff) | |
| download | rails-a63caa4c0c2a8aabc13c354a9193ebd9c5e8ba73.tar.gz rails-a63caa4c0c2a8aabc13c354a9193ebd9c5e8ba73.tar.bz2 rails-a63caa4c0c2a8aabc13c354a9193ebd9c5e8ba73.zip | |
Get tests to run (with failures) without old base around
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 0ddb3f0621..a33302a222 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -1,3 +1,5 @@ +require "active_support/core_ext/class" + module ActionMailer #:nodoc: # Action Mailer allows you to send email from your application using a mailer model and views. # @@ -248,7 +250,7 @@ module ActionMailer #:nodoc: include AdvAttrAccessor, PartContainer, Quoting, Utils if Object.const_defined?(:ActionController) include ActionController::UrlWriter - include ActionController::Layout + include ActionController::Layouts end private_class_method :new #:nodoc: |