summaryrefslogtreecommitdiffstats
path: root/app/email.go
diff options
context:
space:
mode:
authorDerrick Anderson <derrick@andersonwebstudio.com>2018-02-12 14:50:52 -0500
committerDerrick Anderson <derrick@andersonwebstudio.com>2018-02-12 14:50:52 -0500
commitd88d2bc2ed3aefa68b5ed2942f493ae42bb40bfa (patch)
treea99a74d6b858d73624c06f85e393acbe97c90586 /app/email.go
parent07fd7aeeb8eb2b198b01b713a4ab57f6352faef2 (diff)
parent3da5df3c90f5888a3490881957befabb37c308d5 (diff)
downloadchat-d88d2bc2ed3aefa68b5ed2942f493ae42bb40bfa.tar.gz
chat-d88d2bc2ed3aefa68b5ed2942f493ae42bb40bfa.tar.bz2
chat-d88d2bc2ed3aefa68b5ed2942f493ae42bb40bfa.zip
Merge branch 'release-4.7-t4merge'
Diffstat (limited to 'app/email.go')
-rw-r--r--app/email.go1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/email.go b/app/email.go
index 89de2ae65..54a272a3b 100644
--- a/app/email.go
+++ b/app/email.go
@@ -276,6 +276,7 @@ func (a *App) SendInviteEmails(team *model.Team, senderName string, invites []st
props["display_name"] = team.DisplayName
props["name"] = team.Name
props["time"] = fmt.Sprintf("%v", model.GetMillis())
+ props["invite_id"] = team.InviteId
data := model.MapToJson(props)
hash := utils.HashSha256(fmt.Sprintf("%v:%v", data, a.Config().EmailSettings.InviteSalt))
bodyPage.Props["Link"] = fmt.Sprintf("%s/signup_user_complete/?d=%s&h=%s", siteURL, url.QueryEscape(data), url.QueryEscape(hash))