mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
David Heinemeier Hansson 2005-04-07 06:30:59 +00:00
parent 7b37c779d8
commit affe7c0f67
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
actionmailer/CHANGELOG
View File

@ -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]

5
actionmailer/lib/action_mailer/vendor/tmail/quoting.rb vendored
View File

@ -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
end