Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2910 from techAPJ/patch-1 

emails from microsoft outlook 14 were not getting parsed as text
This commit is contained in:
Robin Ward 2014-10-24 11:43:51 -04:00
parent 1493e617e4 7a1731ce0e
commit 842dbed74a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/email/receiver.rb
View File

@ -115,7 +115,7 @@ module Email
text = fix_charset message.text_part
# TODO picking text if available may be better
# in case of email reply from MS Outlook client, prefer text
if (text && !html) || (text && message.header.to_s =~ /X-MS-Has-Attach/)
if (text && !html) || (text && (message.header.to_s =~ /X-MS-Has-Attach/ || message.header.to_s =~ /Microsoft Outlook/))
return text
end
elsif message.content_type =~ /text\/html/