github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-03 19:39:30 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Add Site Setting to use HTML from incoming email when available. (#4236)

Browse Source
This commit is contained in:
David McClure
2016-05-26 01:13:01 -07:00
committed by Régis Hanol
parent a53b6d1d1b
commit a92fd9d701
4 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/email/receiver.rb
View File

@ -212,16 +212,21 @@ module Email
text = fix_charset(@mail)
end
# prefer text over html
text = trim_discourse_markers(text) if text.present?
text, elided = EmailReplyTrimmer.trim(text, true) if text.present?
return [text, elided] if text.present?
use_html = html.present? && (!text.present? || SiteSetting.incoming_email_prefer_html)
use_text = text.present? unless use_html
# clean the html if that's all we've got
html = Email::HtmlCleaner.new(html).output_html if html.present?
html = trim_discourse_markers(html) if html.present?
html, elided = EmailReplyTrimmer.trim(html, true) if html.present?
return [html, elided] if html.present?
if use_text
text = trim_discourse_markers(text)
text, elided = EmailReplyTrimmer.trim(text, true)
return [text, elided]
end
if use_html
html = Email::HtmlCleaner.new(html).output_html
html = trim_discourse_markers(html)
html, elided = EmailReplyTrimmer.trim(html, true)
return [html, elided]
end
end
def fix_charset(mail_part)