From 435ce3df4b1671643f5427b8983d6a0fe1e1dc03 Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Mon, 10 Sep 2018 07:42:59 -0400 Subject: Stop re-wrapping password reset email error in another error (#9382) --- app/user.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'app/user.go') diff --git a/app/user.go b/app/user.go index fa4f36ff1..c8df2ca26 100644 --- a/app/user.go +++ b/app/user.go @@ -1176,11 +1176,7 @@ func (a *App) SendPasswordReset(email string, siteURL string) (bool, *model.AppE return false, err } - if _, err := a.SendPasswordResetEmail(user.Email, token, user.Locale, siteURL); err != nil { - return false, model.NewAppError("SendPasswordReset", "api.user.send_password_reset.send.app_error", nil, "err="+err.Message, http.StatusInternalServerError) - } - - return true, nil + return a.SendPasswordResetEmail(user.Email, token, user.Locale, siteURL) } func (a *App) CreatePasswordRecoveryToken(userId string) (*model.Token, *model.AppError) { -- cgit v1.2.3-1-g7c22