diff options
author | Joshua Peek <josh@joshpeek.com> | 2009-12-21 20:41:25 -0600 |
---|---|---|
committer | Joshua Peek <josh@joshpeek.com> | 2009-12-21 20:41:25 -0600 |
commit | 1de95077dc3bfc7589ca85dc31d46a1ea6db7650 (patch) | |
tree | 1d59980c564e7f917bddc4d5768c1544e971c596 /actionmailer | |
parent | 426348b48403f664cc10e8ec545b640e56c1c090 (diff) | |
parent | 2e571e8f99e5e2712c0bc2558df8d62996204b03 (diff) | |
download | rails-1de95077dc3bfc7589ca85dc31d46a1ea6db7650.tar.gz rails-1de95077dc3bfc7589ca85dc31d46a1ea6db7650.tar.bz2 rails-1de95077dc3bfc7589ca85dc31d46a1ea6db7650.zip |
Merge branch 'master' of github.com:rails/rails
Conflicts:
railties/test/initializer/initialize_i18n_test.rb
railties/test/initializer/path_test.rb
Diffstat (limited to 'actionmailer')
-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 |