diff options
author | Jonathan <jonfritz@gmail.com> | 2018-02-15 03:02:31 -0500 |
---|---|---|
committer | Jesús Espino <jespinog@gmail.com> | 2018-02-15 09:02:31 +0100 |
commit | 05d84a80080b1c494761dd830fc284871337f5ef (patch) | |
tree | db326be06051bd2e6a62b476ff0560ecd0fc12a2 /utils/mail.go | |
parent | 44a27125de1b4658f1149f5bc459468a056b4d7d (diff) | |
download | chat-05d84a80080b1c494761dd830fc284871337f5ef.tar.gz chat-05d84a80080b1c494761dd830fc284871337f5ef.tar.bz2 chat-05d84a80080b1c494761dd830fc284871337f5ef.zip |
Modified advanced mail implementation to properly support multiple attachments with the same file name (#8289)
Diffstat (limited to 'utils/mail.go')
-rw-r--r-- | utils/mail.go | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/utils/mail.go b/utils/mail.go index 633f97818..9023f7090 100644 --- a/utils/mail.go +++ b/utils/mail.go @@ -157,19 +157,18 @@ func sendMail(mimeTo, smtpTo string, from mail.Address, subject, htmlBody string } for _, fileInfo := range attachments { + bytes, err := fileBackend.ReadFile(fileInfo.Path) + if err != nil { + return err + } + m.Attach(fileInfo.Name, gomail.SetCopyFunc(func(writer io.Writer) error { - bytes, err := fileBackend.ReadFile(fileInfo.Path) - if err != nil { - return err - } if _, err := writer.Write(bytes); err != nil { return model.NewAppError("SendMail", "utils.mail.sendMail.attachments.write_error", nil, err.Error(), http.StatusInternalServerError) } return nil })) - } - } conn, err1 := connectToSMTPServer(config) |