diff options
| author | Jonas Östanbäck <cez81@users.noreply.github.com> | 2017-05-14 04:38:30 +0200 |
|---|---|---|
| committer | Lunny Xiao <xiaolunwen@gmail.com> | 2017-05-14 10:38:30 +0800 |
| commit | e214728725b304e92308f3c30235ec0d12dd5478 (patch) | |
| tree | 4693ca1691d8a760db1dc3fd78defa231b0faf8f /routers/user | |
| parent | 9e627af9a449419bcec65ccff1dba00abc625d43 (diff) | |
| download | gitea-e214728725b304e92308f3c30235ec0d12dd5478.tar.gz gitea-e214728725b304e92308f3c30235ec0d12dd5478.zip | |
Add new text for reset password flash (#1718)
* Forgot password should use ResetPwdCodeLives, not ActiveCodeLives
* Improve documentation for different send mail functions related to password reset
* Improve documentation in conf/app.ini regarding xxx_CODE_LIVE_MINUTES settings
Diffstat (limited to 'routers/user')
| -rw-r--r-- | routers/user/auth.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/routers/user/auth.go b/routers/user/auth.go index 68bfe6b05c..856b47bdd1 100644 --- a/routers/user/auth.go +++ b/routers/user/auth.go @@ -913,7 +913,7 @@ func ForgotPasswdPost(ctx *context.Context) { u, err := models.GetUserByEmail(email) if err != nil { if models.IsErrUserNotExist(err) { - ctx.Data["Hours"] = setting.Service.ActiveCodeLives / 60 + ctx.Data["Hours"] = setting.Service.ResetPwdCodeLives / 60 ctx.Data["IsResetSent"] = true ctx.HTML(200, tplForgotPassword) return @@ -940,7 +940,7 @@ func ForgotPasswdPost(ctx *context.Context) { log.Error(4, "Set cache(MailResendLimit) fail: %v", err) } - ctx.Data["Hours"] = setting.Service.ActiveCodeLives / 60 + ctx.Data["Hours"] = setting.Service.ResetPwdCodeLives / 60 ctx.Data["IsResetSent"] = true ctx.HTML(200, tplForgotPassword) } |