summaryrefslogtreecommitdiffstats
path: root/api/user.go
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2016-02-11 08:07:48 -0500
committerChristopher Speller <crspeller@gmail.com>2016-02-11 08:07:48 -0500
commitf2a6826890e5992302dc60ddc271acdae9fe7137 (patch)
treee44a25821e20255e0352db2bbebe91fa900ee43c /api/user.go
parent8291fdd681b840514f54d787a8f4f1f6b1c4d367 (diff)
parent85d0eece3d5b52f05ac741473e3205558be47895 (diff)
downloadchat-f2a6826890e5992302dc60ddc271acdae9fe7137.tar.gz
chat-f2a6826890e5992302dc60ddc271acdae9fe7137.tar.bz2
chat-f2a6826890e5992302dc60ddc271acdae9fe7137.zip
Merge pull request #2143 from ZBoxApp/PLT-1932
PLT-1932: Fix change email subject
Diffstat (limited to 'api/user.go')
-rw-r--r--api/user.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/api/user.go b/api/user.go
index 8f381aeda..db8de5f6a 100644
--- a/api/user.go
+++ b/api/user.go
@@ -1761,14 +1761,14 @@ func sendEmailChangeEmailAndForget(c *Context, oldEmail, newEmail, teamDisplayNa
go func() {
subjectPage := NewServerTemplatePage("email_change_subject", c.Locale)
- subjectPage.Props["Subject"] = c.T("api.templates.email_change_body",
+ subjectPage.Props["Subject"] = c.T("api.templates.email_change_subject",
map[string]interface{}{"TeamDisplayName": teamDisplayName})
bodyPage := NewServerTemplatePage("email_change_body", c.Locale)
bodyPage.Props["SiteURL"] = siteURL
bodyPage.Props["Title"] = c.T("api.templates.email_change_body.title")
- bodyPage.Props["Info"] = c.T("api.templates.email_change_body.info",
- map[string]interface{}{"TeamDisplayName": teamDisplayName, "NewEmail": newEmail})
+ bodyPage.Html["Info"] = template.HTML(c.T("api.templates.email_change_body.info",
+ map[string]interface{}{"TeamDisplayName": teamDisplayName, "NewEmail": newEmail}))
if err := utils.SendMail(oldEmail, subjectPage.Render(), bodyPage.Render()); err != nil {
l4g.Error(utils.T("api.user.send_email_change_email_and_forget.error"), err)