From be225adafbec267353fa7260179b0ce5a72e4283 Mon Sep 17 00:00:00 2001 From: Carlhuda Date: Mon, 21 Dec 2009 16:48:44 -0800 Subject: 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. --- actionmailer/lib/action_mailer/base.rb | 3 +++ 1 file changed, 3 insertions(+) (limited to 'actionmailer/lib') 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 -- cgit v1.2.3