From 7476bc9883eaf182594e78b3f6403ec76b6a2899 Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Wed, 10 Feb 2016 15:20:51 -0300
Subject: Fix change email subject

---
 api/user.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/user.go b/api/user.go
index 8f381aeda..0e2ce45bf 100644
--- a/api/user.go
+++ b/api/user.go
@@ -1761,7 +1761,7 @@ 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)
-- 
cgit v1.2.3-1-g7c22


From d5c666ec12d8156be0d31985202b8a5b4c20c6e4 Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Wed, 10 Feb 2016 16:26:32 -0300
Subject: Change body info from String to HTML

---
 api/templates/email_change_body.html | 2 +-
 api/user.go                          | 2 +-
 2 files changed, 2 insertions(+), 2 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 0e2ce45bf..faa282796 100644
--- a/api/user.go
+++ b/api/user.go
@@ -1767,7 +1767,7 @@ func sendEmailChangeEmailAndForget(c *Context, oldEmail, newEmail, teamDisplayNa
 		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",
+		bodyPage.Html["Info"] = 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 {
-- 
cgit v1.2.3-1-g7c22


From 85d0eece3d5b52f05ac741473e3205558be47895 Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Wed, 10 Feb 2016 16:43:03 -0300
Subject: Need to set as template.HTML

---
 api/user.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/api/user.go b/api/user.go
index faa282796..db8de5f6a 100644
--- a/api/user.go
+++ b/api/user.go
@@ -1767,8 +1767,8 @@ func sendEmailChangeEmailAndForget(c *Context, oldEmail, newEmail, teamDisplayNa
 		bodyPage := NewServerTemplatePage("email_change_body", c.Locale)
 		bodyPage.Props["SiteURL"] = siteURL
 		bodyPage.Props["Title"] = c.T("api.templates.email_change_body.title")
-		bodyPage.Html["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)
-- 
cgit v1.2.3-1-g7c22