diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-09-29 15:34:21 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-09-29 15:34:21 -0400 |
| commit | 942702ff1a6cc3763742ea9fec6ecc587d998411 (patch) | |
| tree | 1e39df01979b0d3086fc627e55a1de1c17ec7c5d /api/user.go | |
| parent | 2d5b2841862e3b932881cc6d087f7dbadcc0cfb8 (diff) | |
| parent | 9c3feff5bcf6478eae29f80d407cbcd1da6ec474 (diff) | |
| download | chat-942702ff1a6cc3763742ea9fec6ecc587d998411.tar.gz chat-942702ff1a6cc3763742ea9fec6ecc587d998411.tar.bz2 chat-942702ff1a6cc3763742ea9fec6ecc587d998411.zip | |
Merge release branch 'release-1.0.0'
Diffstat (limited to 'api/user.go')
| -rw-r--r-- | api/user.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/api/user.go b/api/user.go index 4240a795e..b5f8e997d 100644 --- a/api/user.go +++ b/api/user.go @@ -198,7 +198,7 @@ func CreateUser(c *Context, team *model.Team, user *model.User) *model.User { l4g.Error("Encountered an issue joining default channels user_id=%s, team_id=%s, err=%v", ruser.Id, ruser.TeamId, err) } - fireAndForgetWelcomeEmail(ruser.Email, team.DisplayName, c.GetTeamURLFromTeam(team)) + fireAndForgetWelcomeEmail(ruser.Email, team.DisplayName, c.GetSiteURL(), c.GetTeamURLFromTeam(team)) if user.EmailVerified { if cresult := <-Srv.Store.User().VerifyEmail(ruser.Id); cresult.Err != nil { l4g.Error("Failed to set email verified err=%v", cresult.Err) @@ -218,12 +218,13 @@ func CreateUser(c *Context, team *model.Team, user *model.User) *model.User { } } -func fireAndForgetWelcomeEmail(email, teamDisplayName, teamURL string) { +func fireAndForgetWelcomeEmail(email, teamDisplayName, siteURL, teamURL string) { go func() { subjectPage := NewServerTemplatePage("welcome_subject") subjectPage.Props["TeamDisplayName"] = teamDisplayName bodyPage := NewServerTemplatePage("welcome_body") + bodyPage.Props["SiteURL"] = siteURL bodyPage.Props["TeamURL"] = teamURL if err := utils.SendMail(email, subjectPage.Render(), bodyPage.Render()); err != nil { |