diff options
| author | Jamis Buck <jamis@37signals.com> | 2006-09-09 21:56:38 +0000 |
|---|---|---|
| committer | Jamis Buck <jamis@37signals.com> | 2006-09-09 21:56:38 +0000 |
| commit | 45b5555f4cefaa61456e618e732c9ee5bb5b4e83 (patch) | |
| tree | 499eded831bf7a1e95a66aa96fffdbc460f0b140 /actionmailer/lib/action_mailer | |
| parent | 4d9ca4d9fbed86936b6a2cee792ea8509eef81b2 (diff) | |
| download | rails-45b5555f4cefaa61456e618e732c9ee5bb5b4e83.tar.gz rails-45b5555f4cefaa61456e618e732c9ee5bb5b4e83.tar.bz2 rails-45b5555f4cefaa61456e618e732c9ee5bb5b4e83.zip | |
Make mime version default to 1.0. closes #2323
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5081 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionmailer/lib/action_mailer')
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 00b02c746e..444bea95e0 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -208,9 +208,8 @@ module ActionMailer #:nodoc: # pick a different charset from inside a method with <tt>@charset</tt>. # * <tt>default_content_type</tt> - The default content type used for the main part of the message. Defaults to "text/plain". You # can also pick a different content type from inside a method with <tt>@content_type</tt>. - # * <tt>default_mime_version</tt> - The default mime version used for the message. Defaults to nil. You - # can also pick a different value from inside a method with <tt>@mime_version</tt>. When multipart messages are in - # use, <tt>@mime_version</tt> will be set to "1.0" if it is not set inside a method. + # * <tt>default_mime_version</tt> - The default mime version used for the message. Defaults to "1.0". You + # can also pick a different value from inside a method with <tt>@mime_version</tt>. # * <tt>default_implicit_parts_order</tt> - When a message is built implicitly (i.e. multiple parts are assembled from templates # which specify the content type in their filenames) this variable controls how the parts are ordered. Defaults to # ["text/html", "text/enriched", "text/plain"]. Items that appear first in the array have higher priority in the mail client @@ -257,7 +256,7 @@ module ActionMailer #:nodoc: @@default_content_type = "text/plain" cattr_accessor :default_content_type - @@default_mime_version = nil + @@default_mime_version = "1.0" cattr_accessor :default_mime_version @@default_implicit_parts_order = [ "text/html", "text/enriched", "text/plain" ] |