From 8373b55055f421bb48c375f69d85f6dbbe679649 Mon Sep 17 00:00:00 2001 From: Jamis Buck Date: Thu, 1 Sep 2005 16:00:08 +0000 Subject: * Don't add charset to content-type header for a part that contains subparts (for AOL compatibility) #2013 [John Long] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2091 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionmailer/lib/action_mailer/base.rb | 1 + actionmailer/lib/action_mailer/vendor/tmail/header.rb | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'actionmailer/lib') diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 089b2ef0f6..699714c78f 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -225,6 +225,7 @@ module ActionMailer #:nodoc: end unless @parts.empty? @content_type = "multipart/alternative" + @charset = nil @parts = sort_parts(@parts, @implicit_parts_order) end end diff --git a/actionmailer/lib/action_mailer/vendor/tmail/header.rb b/actionmailer/lib/action_mailer/vendor/tmail/header.rb index 73639b5629..b4ef1809f0 100755 --- a/actionmailer/lib/action_mailer/vendor/tmail/header.rb +++ b/actionmailer/lib/action_mailer/vendor/tmail/header.rb @@ -754,9 +754,11 @@ module TMail strategy.meta @main end @params.each do |k,v| - strategy.meta ';' - strategy.space - strategy.kv_pair k, v + if v + strategy.meta ';' + strategy.space + strategy.kv_pair k, v + end end end -- cgit v1.2.3