diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-02-11 08:07:48 -0500 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-02-11 08:07:48 -0500 |
| commit | f2a6826890e5992302dc60ddc271acdae9fe7137 (patch) | |
| tree | e44a25821e20255e0352db2bbebe91fa900ee43c | |
| parent | 8291fdd681b840514f54d787a8f4f1f6b1c4d367 (diff) | |
| parent | 85d0eece3d5b52f05ac741473e3205558be47895 (diff) | |
| download | chat-f2a6826890e5992302dc60ddc271acdae9fe7137.tar.gz chat-f2a6826890e5992302dc60ddc271acdae9fe7137.tar.bz2 chat-f2a6826890e5992302dc60ddc271acdae9fe7137.zip | |
Merge pull request #2143 from ZBoxApp/PLT-1932
PLT-1932: Fix change email subject
| -rw-r--r-- | api/templates/email_change_body.html | 2 | ||||
| -rw-r--r-- | api/user.go | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/api/templates/email_change_body.html b/api/templates/email_change_body.html index 4f28584c4..41b1bcd7d 100644 --- a/api/templates/email_change_body.html +++ b/api/templates/email_change_body.html @@ -18,7 +18,7 @@ <tr> <td style="border-bottom: 1px solid #ddd; padding: 0 0 20px;"> <h2 style="font-weight: normal; margin-top: 10px;">{{.Props.Title}}</h2> - <p>{{.Props.Info}}</p> + <p>{{.Html.Info}}</p> </td> </tr> <tr> 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) |