diff options
| author | Asaad Mahmood <Unknowngi@live.com> | 2015-06-30 01:07:00 +0500 |
|---|---|---|
| committer | Asaad Mahmood <Unknowngi@live.com> | 2015-06-30 01:07:00 +0500 |
| commit | 7f8c2a9c83477b886b365d3e6d0d040e7314dc18 (patch) | |
| tree | e6a541a8275f37b7f95342ae31eba68de8e2f34d /utils | |
| parent | fce4ad42cbbcd890c9bc8d5fc4963eec7b4867dc (diff) | |
| parent | e6b5bdef82b23d61286ff455ee245a26a40d195f (diff) | |
| download | chat-7f8c2a9c83477b886b365d3e6d0d040e7314dc18.tar.gz chat-7f8c2a9c83477b886b365d3e6d0d040e7314dc18.tar.bz2 chat-7f8c2a9c83477b886b365d3e6d0d040e7314dc18.zip | |
Merge branch 'master' of https://github.com/mattermost/platform
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" |