diff options
| author | Jamis Buck <jamis@37signals.com> | 2006-03-19 00:18:50 +0000 |
|---|---|---|
| committer | Jamis Buck <jamis@37signals.com> | 2006-03-19 00:18:50 +0000 |
| commit | 49efa02b9e8d868b2d28a3db76269d8b8fcde0a6 (patch) | |
| tree | 0ec96c2e208dcecc1fff84ad85ba61dce3499871 /actionmailer/lib | |
| parent | db0e8ff1c3496841d7a307794dacecd82e55ce6a (diff) | |
| download | rails-49efa02b9e8d868b2d28a3db76269d8b8fcde0a6.tar.gz rails-49efa02b9e8d868b2d28a3db76269d8b8fcde0a6.tar.bz2 rails-49efa02b9e8d868b2d28a3db76269d8b8fcde0a6.zip | |
Nil charset caused subject line to be improperly quoted in implicitly multipart messages (closes #2662)
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3960 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionmailer/lib')
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 42d48fd5a6..03d8760d8f 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -293,7 +293,6 @@ module ActionMailer end unless @parts.empty? @content_type = "multipart/alternative" - @charset = nil @parts = sort_parts(@parts, @implicit_parts_order) end end @@ -432,7 +431,10 @@ module ActionMailer m.parts << part end - m.set_content_type(real_content_type, nil, ctype_attrs) if real_content_type =~ /multipart/ + if real_content_type =~ /multipart/ + ctype_attrs.delete "charset" + m.set_content_type(real_content_type, nil, ctype_attrs) + end end @mail = m |