github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 04:01:18 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Have parse_body() recover from ASCII-8BIT encoding

Browse Source 
Added a test to make sure that the result can be passed into TextCleaner
(which expects UTF-8)
This commit is contained in:
riking
2014-08-28 12:09:42 -07:00
parent 1c9f6159cd
commit 8ddd90daa4
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/email/receiver.rb
View File

@ -95,6 +95,7 @@ module Email
def parse_body(message)
body = select_body message
encoding = body.encoding
raise EmptyEmailError if body.strip.blank?
body = discourse_email_trimmer body
@ -103,7 +104,7 @@ module Email
body = EmailReplyParser.parse_reply body
raise EmptyEmailError if body.strip.blank?
body
body.force_encoding(encoding).encode("UTF-8")
end
def select_body(message)