From c884ecfea18b001ceb9cdbe98c8618a345f460e0 Mon Sep 17 00:00:00 2001 From: Peter Date: Fri, 19 Dec 2014 23:06:03 +0200 Subject: Parse the from string to extract the email address --- modules/mailer/mailer.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'modules/mailer') diff --git a/modules/mailer/mailer.go b/modules/mailer/mailer.go index 3ce14822f7..fd10c1e5a9 100644 --- a/modules/mailer/mailer.go +++ b/modules/mailer/mailer.go @@ -8,6 +8,7 @@ import ( "crypto/tls" "fmt" "net" + "net/mail" "net/smtp" "strings" @@ -124,8 +125,12 @@ func sendMail(settings *setting.Mailer, recipients []string, msgContent []byte) } } - if err = client.Mail(settings.From); err != nil { + if fromAddress, err := mail.ParseAddress(settings.From); err != nil { return err + } else { + if err = client.Mail(fromAddress.Address); err != nil { + return err + } } for _, rec := range recipients { -- cgit v1.2.3