From c7a8051a711d4a87aff5895e27e56a74fc653023 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Thu, 23 Feb 2017 12:16:10 -0500 Subject: mailer: make text/html as default format Change config option from '[mailer] ENABLE_HTML_ALTERNATIVE' to '[mailer] USE_PLAIN_TEXT' --- modules/mailer/mailer.go | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'modules/mailer/mailer.go') diff --git a/modules/mailer/mailer.go b/modules/mailer/mailer.go index c111732f..5eb68944 100644 --- a/modules/mailer/mailer.go +++ b/modules/mailer/mailer.go @@ -36,16 +36,18 @@ func NewMessageFrom(to []string, from, subject, htmlBody string) *Message { msg.SetHeader("Subject", subject) msg.SetDateHeader("Date", time.Now()) - body, err := html2text.FromString(htmlBody) - if err != nil { - log.Error(4, "html2text.FromString: %v", err) - msg.SetBody("text/html", htmlBody) - } else { - msg.SetBody("text/plain", body) - if setting.MailService.EnableHTMLAlternative { - msg.AddAlternative("text/html", htmlBody) + contentType := "text/html" + body := htmlBody + if setting.MailService.UsePlainText { + plainBody, err := html2text.FromString(htmlBody) + if err != nil { + log.Error(2, "html2text.FromString: %v", err) + } else { + contentType = "text/plain" + body = plainBody } } + msg.SetBody(contentType, body) return &Message{ Message: msg, -- cgit v1.2.3