mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
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.
This commit is contained in:
parent
a43a9c81cf
commit
be225adafb
1 changed files with 3 additions and 0 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue