mirrors
/
forgejo
mirror of
1
Fork 0
Code Issues Releases Activity

Merge pull request #1596 from denghongcai/develop 

implemented #1528
This commit is contained in:
无闻 2015-09-07 13:10:59 -04:00
parent 5020576e80 fbb3486c95
commit 36405d0faa
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/mailer/mailer.go
View File

@ -48,6 +48,7 @@ type Message struct {
To []string To []string
From string From string
Subject string Subject string
ReplyTo string
Body string Body string
Type string Type string
Massive bool Massive bool
@ -63,7 +64,7 @@ func (m Message) Content() string {
} }
// create mail content // create mail content
content := "From: " + m.From + "\r\nSubject: " + m.Subject + "\r\nContent-Type: " + contentType + "\r\n\r\n" + m.Body content := "From: " + m.From + "\r\nReply-To: " + m.ReplyTo + "\r\nSubject: " + m.Subject + "\r\nContent-Type: " + contentType + "\r\n\r\n" + m.Body
return content return content
} }
@ -252,7 +253,8 @@ func SendAsync(msg *Message) {
func NewHtmlMessage(To []string, From, Subject, Body string) Message { func NewHtmlMessage(To []string, From, Subject, Body string) Message {
return Message{ return Message{
To: To, To: To,
From: From, From: setting.MailService.From,
ReplyTo: From,
Subject: Subject, Subject: Subject,
Body: Body, Body: Body,
Type: "html", Type: "html",