tom/forkjo
tom/forkjo
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions 1

#2954 minor fix for when to set HTML alternative

Browse source
This commit is contained in:
Unknwon 2016-05-30 01:50:20 -07:00
parent 3d105733a9
commit 0240f520ab
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/mailer/mailer.go
View file

@ -38,14 +38,12 @@ func NewMessageFrom(to []string, from, subject, htmlBody string) *Message {
if err != nil { if err != nil {
log.Error(4, "html2text.FromString: %v", err) log.Error(4, "html2text.FromString: %v", err)
msg.SetBody("text/html", htmlBody) msg.SetBody("text/html", htmlBody)
msg.AddAlternative("text/html", htmlBody)
} else { } else {
msg.SetBody("text/plain", body) msg.SetBody("text/plain", body)
}
if setting.MailService.EnableHTMLAlternative { if setting.MailService.EnableHTMLAlternative {
msg.AddAlternative("text/html", htmlBody) msg.AddAlternative("text/html", htmlBody)
} }
}
return &Message{ return &Message{
Message: msg, Message: msg,