From 452bb1e48d7fa3dd4b2684d9d8ba3091200d59fe Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Wed, 27 Jan 2010 19:37:47 -0800 Subject: Rename 'defaults' class method to 'default' to reflect that it's a declaration --- actionmailer/lib/action_mailer/old_api.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'actionmailer/lib/action_mailer/old_api.rb') 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 -- cgit v1.2.3