Permalink
Browse files

Merge branch 'dev' of https://github.com/textpattern/textpattern into…

… dev
  • Loading branch information...
makss committed Nov 14, 2017
2 parents 7b7755e + ebcfc61 commit 38b38a4c60779761a199d6f62ffb7b6af72987c9
Showing with 4 additions and 6 deletions.
  1. +0 −1 textpattern/lang/en.txt
  2. +4 −5 textpattern/lib/txplib_admin.php
View
@@ -67,7 +67,6 @@ token_expired => Password reset security token has expired.
unable_retrieve_template => Unable to retrieve template.
unable_retrieve_user => Unable to retrieve user.
unable_set_template => Unable to set template.
unknown_author => Unknown author: <strong>{name}</strong>.
your_login_info => Your login info
your_login_is => Your login is
your_new_password => Your new password
@@ -144,11 +144,10 @@ function send_reset_confirmation_request($name)
return array(gTxt('could_not_mail'), E_ERROR);
}
} else {
// Though 'unknown_author' could be thrown, send generic 'request_sent'
// message instead so that (non-)existence of account names are not leaked.
// Since this is a short circuit, there's a possibility of a timing attack
// revealing the existence of an account, which we could defend against
// to some degree.
// Send generic 'request_sent' message so that (non-)existence of
// account names are not leaked. Since this is a short circuit, there's
// a possibility of a timing attack revealing the existence of an
// account, which we could defend against to some degree.
return gTxt('password_reset_confirmation_request_sent');
}
}

0 comments on commit 38b38a4

Please sign in to comment.