diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-10-20 14:50:03 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-10-20 14:50:03 -0700 |
| commit | e1f94590290bf3061fdce48b25b2e74a2c8a0853 (patch) | |
| tree | b67ae40ea40f64f2e6c5a29e50b78199ed9a2c63 /web/web.go | |
| parent | 1fc12dd8ba2238eba7d154eee55e1381e7415372 (diff) | |
| parent | e0cda76eb816da8fda9c42d67197be71201c242e (diff) | |
| download | chat-e1f94590290bf3061fdce48b25b2e74a2c8a0853.tar.gz chat-e1f94590290bf3061fdce48b25b2e74a2c8a0853.tar.bz2 chat-e1f94590290bf3061fdce48b25b2e74a2c8a0853.zip | |
Merge branch 'master' into PLT-44
Diffstat (limited to 'web/web.go')
| -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 e379bf35c..0a0e57f4b 100644 --- a/web/web.go +++ b/web/web.go @@ -454,9 +454,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) |