mirror of
https://github.com/codeninjasllc/discourse.git
synced 2024-11-27 17:46:05 -05:00
Merge pull request #3112 from techAPJ/patch-1
FIX: convert UTF8 charset to UTF-8
This commit is contained in:
commit
d3ebb9e711
1 changed files with 2 additions and 0 deletions
|
@ -146,6 +146,8 @@ module Email
|
|||
return nil if object.nil?
|
||||
|
||||
if object.charset
|
||||
# convert UTF8 charset to UTF-8
|
||||
object.charset = object.charset.gsub(/utf8/i, "UTF-8") if object.charset.downcase == "utf8"
|
||||
object.body.decoded.force_encoding(object.charset).encode("UTF-8").to_s
|
||||
else
|
||||
object.body.to_s
|
||||
|
|
Loading…
Reference in a new issue