Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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
  • Loading branch information...
commit affe7c0f679e8f11724c249b594dc51724068af2 1 parent 7b37c77
@dhh dhh authored
View
5 actionmailer/CHANGELOG
@@ -1,3 +1,8 @@
+*SVN*
+
+* Fixed unquoting of emails that doesn't have an explicit charset #1036 [wolfgang@stufenlos.net]
+
+
*0.8.1* (27th March, 2005)
* Fixed that if charset was found that the end of a mime part declaration TMail would throw an error #919 [lon@speedymac.com]
View
5 actionmailer/lib/action_mailer/vendor/tmail/quoting.rb
@@ -9,7 +9,8 @@ def subject(to_charset = 'utf-8')
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 @@ def body
end
end
end
-end
+end
Please sign in to comment.
Something went wrong with that request. Please try again.