aboutsummaryrefslogtreecommitdiff
path: root/engine/lib
diff options
context:
space:
mode:
authorCash Costello <cash.costello@gmail.com>2011-10-27 04:43:28 -0700
committerCash Costello <cash.costello@gmail.com>2011-10-27 04:43:28 -0700
commit8e255f9d19b7ae65f39664627946a09a61911c4a (patch)
tree08625ea2aa6568b6b9c070c8b8d2265f854ce8bf /engine/lib
parentbce6a708f78619b735295b04ec6ac55e20a2442f (diff)
parentc3cb9c0e29e85a9d3e2e6447e7df0918676eca83 (diff)
downloadelgg-8e255f9d19b7ae65f39664627946a09a61911c4a.tar.gz
elgg-8e255f9d19b7ae65f39664627946a09a61911c4a.tar.bz2
Merge pull request #79 from Germanaz0/master
Clean login failures on new password request
Diffstat (limited to 'engine/lib')
-rw-r--r--engine/lib/users.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/engine/lib/users.php b/engine/lib/users.php
index f47cc1add..54d87b2fd 100644
--- a/engine/lib/users.php
+++ b/engine/lib/users.php
@@ -742,7 +742,9 @@ function execute_new_password_request($user_guid, $conf_code) {
if (force_user_password_reset($user_guid, $password)) {
remove_private_setting($user_guid, 'passwd_conf_code');
-
+ // clean the logins failures
+ reset_login_failure_count($user_guid);
+
$email = elgg_echo('email:resetpassword:body', array($user->name, $password));
return notify_user($user->guid, $CONFIG->site->guid,