From affe7c0f679e8f11724c249b594dc51724068af2 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Thu, 7 Apr 2005 06:30:59 +0000 Subject: Fixed unquoting of emails that doesn't have an explicit charset #1036 [wolfgang@stufenlos.net] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1105 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionmailer/lib/action_mailer/vendor/tmail/quoting.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'actionmailer/lib/action_mailer/vendor') diff --git a/actionmailer/lib/action_mailer/vendor/tmail/quoting.rb b/actionmailer/lib/action_mailer/vendor/tmail/quoting.rb index 626e88238f..1ff00d9299 100644 --- a/actionmailer/lib/action_mailer/vendor/tmail/quoting.rb +++ b/actionmailer/lib/action_mailer/vendor/tmail/quoting.rb @@ -9,7 +9,8 @@ begin end def unquoted_body(to_charset = 'utf-8') - Unquoter.unquote_and_convert_to(quoted_body, to_charset, header["content-type"]["charset"]) + from_charset = header['content-type']['charset'] rescue 'us-ascii' + Unquoter.unquote_and_convert_to(quoted_body, to_charset, from_charset) end def body(to_charset = 'utf-8', &block) @@ -97,4 +98,4 @@ rescue LoadError => e end end end -end \ No newline at end of file +end -- cgit v1.2.3