diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-07-05 09:02:23 -0800 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-07-05 09:02:23 -0800 |
| commit | 592d68cf4134b668e3ff962d17f8aa75b1bc055f (patch) | |
| tree | 6e743b07487caf5fe350439aefdf0355a7e80d9b /utils | |
| parent | 72bfc1ee2afd2fa4a34186b62f144f8f6c50d693 (diff) | |
| parent | 4a3003c0dcf7d642f233493e32b07beed5d08327 (diff) | |
| download | chat-592d68cf4134b668e3ff962d17f8aa75b1bc055f.tar.gz chat-592d68cf4134b668e3ff962d17f8aa75b1bc055f.tar.bz2 chat-592d68cf4134b668e3ff962d17f8aa75b1bc055f.zip | |
Merge branch 'master' into mm-1391
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/mail.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/utils/mail.go b/utils/mail.go index 2fb7f801d..3cd37ffef 100644 --- a/utils/mail.go +++ b/utils/mail.go @@ -11,6 +11,7 @@ import ( "net" "net/mail" "net/smtp" + "html" ) func CheckMailSettings() *model.AppError { @@ -84,7 +85,7 @@ func SendMail(to, subject, body string) *model.AppError { headers := make(map[string]string) headers["From"] = fromMail.String() headers["To"] = toMail.String() - headers["Subject"] = subject + headers["Subject"] = html.UnescapeString(subject) headers["MIME-version"] = "1.0" headers["Content-Type"] = "text/html" |