diff options
| author | Chris <ccbrown112@gmail.com> | 2017-10-30 11:57:24 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-30 11:57:24 -0500 |
| commit | c5e8cb25caa39ed018ede5270e1566e8f7448396 (patch) | |
| tree | 80f9f8957d4ff8458ecf9631135c916df25544bd /app/user.go | |
| parent | 63df41b91110bac06baffef87fe0c1952b47ac93 (diff) | |
| download | chat-c5e8cb25caa39ed018ede5270e1566e8f7448396.tar.gz chat-c5e8cb25caa39ed018ede5270e1566e8f7448396.tar.bz2 chat-c5e8cb25caa39ed018ede5270e1566e8f7448396.zip | |
simplify things (#7735)
Diffstat (limited to 'app/user.go')
| -rw-r--r-- | app/user.go | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/app/user.go b/app/user.go index 87b21fb92..3272781e7 100644 --- a/app/user.go +++ b/app/user.go @@ -864,11 +864,7 @@ func (a *App) UpdatePasswordAsUser(userId, currentPassword, newPassword string) T := utils.GetUserTranslations(user.Locale) - if err := a.UpdatePasswordSendEmail(user, newPassword, T("api.user.update_password.menu")); err != nil { - return err - } - - return nil + return a.UpdatePasswordSendEmail(user, newPassword, T("api.user.update_password.menu")) } func (a *App) UpdateActiveNoLdap(userId string, active bool) (*model.User, *model.AppError) { @@ -1353,11 +1349,7 @@ func (a *App) GetVerifyEmailToken(token string) (*model.Token, *model.AppError) } func (a *App) VerifyUserEmail(userId string) *model.AppError { - if err := (<-a.Srv.Store.User().VerifyEmail(userId)).Err; err != nil { - return err - } - - return nil + return (<-a.Srv.Store.User().VerifyEmail(userId)).Err } func (a *App) SearchUsers(props *model.UserSearch, searchOptions map[string]bool, asAdmin bool) ([]*model.User, *model.AppError) { |