diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2010-01-27 19:37:47 -0800 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2010-01-27 19:38:17 -0800 |
commit | 452bb1e48d7fa3dd4b2684d9d8ba3091200d59fe (patch) | |
tree | 5145ae6ce81a817e29b96134b3adae75898ba30a /actionmailer/lib/action_mailer/old_api.rb | |
parent | 079714277df4641a24513b2595c0237293f48512 (diff) | |
download | rails-452bb1e48d7fa3dd4b2684d9d8ba3091200d59fe.tar.gz rails-452bb1e48d7fa3dd4b2684d9d8ba3091200d59fe.tar.bz2 rails-452bb1e48d7fa3dd4b2684d9d8ba3091200d59fe.zip |
Rename 'defaults' class method to 'default' to reflect that it's a declaration
Diffstat (limited to 'actionmailer/lib/action_mailer/old_api.rb')
-rw-r--r-- | actionmailer/lib/action_mailer/old_api.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/actionmailer/lib/action_mailer/old_api.rb b/actionmailer/lib/action_mailer/old_api.rb index 4694958222..936ceb0dd6 100644 --- a/actionmailer/lib/action_mailer/old_api.rb +++ b/actionmailer/lib/action_mailer/old_api.rb @@ -187,10 +187,10 @@ module ActionMailer # mailer. Subclasses may override this method to provide different # defaults. def initialize_defaults(method_name) - @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) + @charset ||= self.class.default[:charset].try(:dup) + @content_type ||= self.class.default[:content_type].try(:dup) + @implicit_parts_order ||= self.class.default[:parts_order].try(:dup) + @mime_version ||= self.class.default[:mime_version].try(:dup) @mailer_name ||= self.class.mailer_name.dup @template ||= method_name @@ -245,4 +245,4 @@ module ActionMailer end end end -end
\ No newline at end of file +end |