diff options
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/config.go | 2 | ||||
| -rw-r--r-- | utils/mail.go | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/utils/config.go b/utils/config.go index 6a7e4589c..eb2ae3050 100644 --- a/utils/config.go +++ b/utils/config.go @@ -98,7 +98,7 @@ type PrivacySettings struct { type TeamSettings struct { MaxUsersPerTeam int AllowPublicLink bool - AllowValet bool + AllowValetDefault bool TermsLink string PrivacyLink string AboutLink string 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" |