diff options
| author | José Valim <jose.valim@gmail.com> | 2009-12-22 08:26:00 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-12-22 08:26:00 +0100 |
| commit | 4b8330d2d50ae4de14dd43ffbea4d91804553140 (patch) | |
| tree | 8d925e361688cf09ab6e3fe8df6b9609a69ffa83 /actionmailer/lib | |
| parent | 5f34421c77b4cd873baadbbca877a93de5a4d602 (diff) | |
| parent | 8e48a5ef0ca488b2264acd2b38bdae14970c011f (diff) | |
| download | rails-4b8330d2d50ae4de14dd43ffbea4d91804553140.tar.gz rails-4b8330d2d50ae4de14dd43ffbea4d91804553140.tar.bz2 rails-4b8330d2d50ae4de14dd43ffbea4d91804553140.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'actionmailer/lib')
| -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 |