diff options
Diffstat (limited to 'routers/user')
| -rw-r--r-- | routers/user/auth.go | 3 | ||||
| -rw-r--r-- | routers/user/setting.go | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/routers/user/auth.go b/routers/user/auth.go index c3fb911b07..6edcb914b1 100644 --- a/routers/user/auth.go +++ b/routers/user/auth.go @@ -984,7 +984,6 @@ func ResetPasswdPost(ctx *context.Context) { return } - u.Passwd = passwd var err error if u.Rands, err = models.GetUserSalt(); err != nil { ctx.ServerError("UpdateUser", err) @@ -994,7 +993,7 @@ func ResetPasswdPost(ctx *context.Context) { ctx.ServerError("UpdateUser", err) return } - u.HashPassword() + u.HashPassword(passwd) if err := models.UpdateUserCols(u, "passwd", "rands", "salt"); err != nil { ctx.ServerError("UpdateUser", err) return diff --git a/routers/user/setting.go b/routers/user/setting.go index dcd0eedb8d..b674c24b44 100644 --- a/routers/user/setting.go +++ b/routers/user/setting.go @@ -229,13 +229,12 @@ func SettingsSecurityPost(ctx *context.Context, form auth.ChangePasswordForm) { } else if form.Password != form.Retype { ctx.Flash.Error(ctx.Tr("form.password_not_match")) } else { - ctx.User.Passwd = form.Password var err error if ctx.User.Salt, err = models.GetUserSalt(); err != nil { ctx.ServerError("UpdateUser", err) return } - ctx.User.HashPassword() + ctx.User.HashPassword(form.Password) if err := models.UpdateUserCols(ctx.User, "salt", "passwd"); err != nil { ctx.ServerError("UpdateUser", err) return |