summaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2015-06-29 11:08:42 -0800
committerCorey Hulen <corey@hulen.com>2015-06-29 11:08:42 -0800
commit5a1562cafb07c0e2a4b072179fa50bb78add1c9b (patch)
treea653c1d7be827b47b47f86ac561a4861e2e4a16c /utils
parent0792eb18d535410b456f3cc569e243efb85a47b6 (diff)
parent94390236fd75c2b1f70519bc2e44f70e00b8a81b (diff)
downloadchat-5a1562cafb07c0e2a4b072179fa50bb78add1c9b.tar.gz
chat-5a1562cafb07c0e2a4b072179fa50bb78add1c9b.tar.bz2
chat-5a1562cafb07c0e2a4b072179fa50bb78add1c9b.zip
Merge pull request #51 from rgarmsen2295/mm-1287
MM-1287
Diffstat (limited to 'utils')
-rw-r--r--utils/mail.go3
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"