diff options
| author | Sven Fuchs <svenfuchs@artweb-design.de> | 2008-07-04 22:45:53 +0200 |
|---|---|---|
| committer | Sven Fuchs <svenfuchs@artweb-design.de> | 2008-07-04 22:45:53 +0200 |
| commit | a865d19516a716762b46ca29212bac668dd7c4a0 (patch) | |
| tree | 91fcef5d9d0095a36b373ece4ef6b8bf4e19b5b1 /actionmailer | |
| parent | 34bd1e95c7a08c9266fc99281417dad4a19cdf73 (diff) | |
| download | rails-a865d19516a716762b46ca29212bac668dd7c4a0.tar.gz rails-a865d19516a716762b46ca29212bac668dd7c4a0.tar.bz2 rails-a865d19516a716762b46ca29212bac668dd7c4a0.zip | |
reverting changes to ActionMailer
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index b1f23583a6..1518e23dfe 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -307,6 +307,10 @@ module ActionMailer #:nodoc: # Specify the CC addresses for the message. adv_attr_accessor :cc + # Specify the charset to use for the message. This defaults to the + # +default_charset+ specified for ActionMailer::Base. + adv_attr_accessor :charset + # Specify the content type for the message. This defaults to <tt>text/plain</tt> # in most cases, but can be automatically set in some situations. adv_attr_accessor :content_type @@ -513,6 +517,7 @@ module ActionMailer #:nodoc: # mailer. Subclasses may override this method to provide different # defaults. def initialize_defaults(method_name) + @charset ||= @@default_charset.dup @content_type ||= @@default_content_type.dup @implicit_parts_order ||= @@default_implicit_parts_order.dup @template ||= method_name |