diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2015-10-20 07:58:05 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2015-10-20 07:58:05 -0400 |
| commit | 7d8e08ccf6211d3df78eb6cfd4a198df77072540 (patch) | |
| tree | 8703ffd97990c74e60360b6ddba811eb0065eea1 /web | |
| parent | 88b3aa4d80e7ee540083f897cdce3f9634c4a8f9 (diff) | |
| parent | 04bf527966db559523fb0ec317af5076241f1bc5 (diff) | |
| download | chat-7d8e08ccf6211d3df78eb6cfd4a198df77072540.tar.gz chat-7d8e08ccf6211d3df78eb6cfd4a198df77072540.tar.bz2 chat-7d8e08ccf6211d3df78eb6cfd4a198df77072540.zip | |
Merge pull request #1095 from rgarmsen2295/plt-661
PLT-661 Changed all goroutine functions to use '...AndForget' as the naming convention
Diffstat (limited to 'web')
| -rw-r--r-- | web/web.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/web/web.go b/web/web.go index a24f1589d..3bfed371b 100644 --- a/web/web.go +++ b/web/web.go @@ -429,9 +429,9 @@ func verifyEmail(c *api.Context, w http.ResponseWriter, r *http.Request) { user := result.Data.(*model.User) if user.LastActivityAt > 0 { - api.FireAndForgetEmailChangeVerifyEmail(user.Id, user.Email, team.Name, team.DisplayName, c.GetSiteURL(), c.GetTeamURLFromTeam(team)) + api.SendEmailChangeVerifyEmailAndForget(user.Id, user.Email, team.Name, team.DisplayName, c.GetSiteURL(), c.GetTeamURLFromTeam(team)) } else { - api.FireAndForgetVerifyEmail(user.Id, user.Email, team.Name, team.DisplayName, c.GetSiteURL(), c.GetTeamURLFromTeam(team)) + api.SendVerifyEmailAndForget(user.Id, user.Email, team.Name, team.DisplayName, c.GetSiteURL(), c.GetTeamURLFromTeam(team)) } newAddress := strings.Replace(r.URL.String(), "&resend=true", "&resend_success=true", -1) |