diff options
author | Carlhuda <carlhuda@engineyard.com> | 2009-12-21 16:48:44 -0800 |
---|---|---|
committer | Carlhuda <carlhuda@engineyard.com> | 2009-12-21 16:49:21 -0800 |
commit | be225adafbec267353fa7260179b0ce5a72e4283 (patch) | |
tree | 2f05ec01e73f56040bcb717ef379df205a6cbef5 /actionmailer/lib/action_mailer | |
parent | a43a9c81cf3d85e8dca6afdd92307ce153643ebe (diff) | |
download | rails-be225adafbec267353fa7260179b0ce5a72e4283.tar.gz rails-be225adafbec267353fa7260179b0ce5a72e4283.tar.bz2 rails-be225adafbec267353fa7260179b0ce5a72e4283.zip |
Fix ActionMailer. The fact that ActionMailer::Base does not inherit from AbstractController::Base is either a bug or we need to re-evaluate the requirements of the mixins.
Diffstat (limited to 'actionmailer/lib/action_mailer')
-rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index a69838fe43..40aff7f0d8 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -271,6 +271,8 @@ module ActionMailer #:nodoc: class_inheritable_accessor :view_paths self.view_paths = [] + attr_internal :formats + cattr_accessor :logger @@raise_delivery_errors = true @@ -452,6 +454,7 @@ module ActionMailer #:nodoc: # remain uninitialized (useful when you only need to invoke the "receive" # method, for instance). def initialize(method_name=nil, *parameters) #:nodoc: + @_formats = [] @_response_body = nil super() create!(method_name, *parameters) if method_name |