diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2005-05-10 13:40:26 +0000 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-05-10 13:40:26 +0000 |
commit | 9c9286710268ff124ffe68727030dbe401bbc3c2 (patch) | |
tree | 8816e11fe7396c03412b5ffac79ad6a6d65c230a /actionmailer/lib/action_mailer/vendor/tmail/quoting.rb | |
parent | 8983a097522c08f4173abad5c1715268f31e994a (diff) | |
download | rails-9c9286710268ff124ffe68727030dbe401bbc3c2.tar.gz rails-9c9286710268ff124ffe68727030dbe401bbc3c2.tar.bz2 rails-9c9286710268ff124ffe68727030dbe401bbc3c2.zip |
Fix attachments and content-type problems #1276 [Jamis Buck] Fix to only perform the charset conversion if a 'from' and a 'to' charset are given (make no assumptions about what the charset was) #1276 [Jamis Buck]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1300 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionmailer/lib/action_mailer/vendor/tmail/quoting.rb')
-rw-r--r-- | actionmailer/lib/action_mailer/vendor/tmail/quoting.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/quoting.rb b/actionmailer/lib/action_mailer/vendor/tmail/quoting.rb index a31638100b..0c2653a6e0 100644 --- a/actionmailer/lib/action_mailer/vendor/tmail/quoting.rb +++ b/actionmailer/lib/action_mailer/vendor/tmail/quoting.rb @@ -1,5 +1,3 @@ -require 'base64' - module TMail class Mail def subject(to_charset = 'utf-8') @@ -29,9 +27,10 @@ module TMail if multipart? parts.collect { |part| - part.header["content-type"].main_type == "text" ? + header = part.header["content-type"] + header && header.main_type == "text" ? part.unquoted_body(to_charset) : - attachment_presenter.call(part.header["content-type"].params["name"]) + (header ? attachment_presenter.call(header.params["name"]) : "") }.join else unquoted_body(to_charset) @@ -65,13 +64,14 @@ module TMail end def unquote_base64_and_convert_to(text, to, from) - convert_to(Base64.decode64(text), to, from) + convert_to(Base64.decode(text).first, to, from) end begin require 'iconv' def convert_to(text, to, from) - text ? Iconv.iconv(to, from || "ISO-8859-1", text).first : "" + return text unless to && from + text ? Iconv.iconv(to, from, text).first : "" end rescue LoadError # Not providing quoting support |