diff options
| author | José Valim and Mikel Lindsaar <pair@programming.com> | 2010-01-26 11:46:42 +0100 |
|---|---|---|
| committer | José Valim and Mikel Lindsaar <pair@programming.com> | 2010-01-26 11:46:42 +0100 |
| commit | 39a1b06f13221e00ab38dff960155cb5fe9eaabb (patch) | |
| tree | 84fd33338a523b75b89dded8c2a5a8b812c7f136 /actionmailer/lib/action_mailer/old_api.rb | |
| parent | 9dd65c368b40093cfc686956a48c18b78abacf7f (diff) | |
| download | rails-39a1b06f13221e00ab38dff960155cb5fe9eaabb.tar.gz rails-39a1b06f13221e00ab38dff960155cb5fe9eaabb.tar.bz2 rails-39a1b06f13221e00ab38dff960155cb5fe9eaabb.zip | |
Deprecate old defaults API.
Diffstat (limited to 'actionmailer/lib/action_mailer/old_api.rb')
| -rw-r--r-- | actionmailer/lib/action_mailer/old_api.rb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/actionmailer/lib/action_mailer/old_api.rb b/actionmailer/lib/action_mailer/old_api.rb index f5b077ab98..22c3c518b1 100644 --- a/actionmailer/lib/action_mailer/old_api.rb +++ b/actionmailer/lib/action_mailer/old_api.rb @@ -1,3 +1,5 @@ +require 'active_support/core_ext/object/try' + module ActionMailer module OldApi #:nodoc: extend ActiveSupport::Concern @@ -185,10 +187,10 @@ module ActionMailer # mailer. Subclasses may override this method to provide different # defaults. def initialize_defaults(method_name) - @charset ||= self.class.default_charset.dup - @content_type ||= self.class.default_content_type.dup - @implicit_parts_order ||= self.class.default_implicit_parts_order.dup - @mime_version ||= self.class.default_mime_version.dup if self.class.default_mime_version + @charset ||= self.class.defaults[:charset].try(:dup) + @content_type ||= self.class.defaults[:content_type].try(:dup) + @implicit_parts_order ||= self.class.defaults[:parts_order].try(:dup) + @mime_version ||= self.class.defaults[:mime_version].try(:dup) @mailer_name ||= self.class.mailer_name.dup @template ||= method_name |