From aa409144fcac454c8f6e2566606e0fb206d933d7 Mon Sep 17 00:00:00 2001 From: cash Date: Fri, 19 Apr 2013 20:00:47 -0400 Subject: Fixes #5233 password reset uses entity save so memcache is cleared --- engine/lib/users.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/engine/lib/users.php b/engine/lib/users.php index 868cd7815..9a5194896 100644 --- a/engine/lib/users.php +++ b/engine/lib/users.php @@ -705,18 +705,18 @@ function send_new_password_request($user_guid) { * @return bool */ function force_user_password_reset($user_guid, $password) { - global $CONFIG; - $user = get_entity($user_guid); if ($user instanceof ElggUser) { - $salt = generate_random_cleartext_password(); // Reset the salt - $user->salt = $salt; + $ia = elgg_set_ignore_access(); - $hash = generate_user_password($user, $password); + $user->salt = generate_random_cleartext_password(); + $hash = generate_user_password($user, $password); + $user->password = $hash; + $result = (bool)$user->save(); - $query = "UPDATE {$CONFIG->dbprefix}users_entity - set password='$hash', salt='$salt' where guid=$user_guid"; - return update_data($query); + elgg_set_ignore_access($ia); + + return $result; } return false; -- cgit v1.2.3