diff options
| -rw-r--r-- | engine/lib/elgglib.php | 10 | ||||
| -rw-r--r-- | engine/lib/users.php | 18 |
2 files changed, 15 insertions, 13 deletions
diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php index cf3d25822..fb7a4578b 100644 --- a/engine/lib/elgglib.php +++ b/engine/lib/elgglib.php @@ -1335,9 +1335,11 @@ function elgg_deprecated_notice($msg, $dep_version) { * @param string $file Optional file that the function must reside in. * * @return bool - * @todo This is neat but is it necessary? + * + * @deprecated 1.8 A neat but pointless function */ function call_gatekeeper($function, $file = "") { + elgg_deprecated_notice("call_gatekeeper() is neat but pointless", 1.8); // Sanity check if (!$function) { return false; @@ -1401,11 +1403,13 @@ function call_gatekeeper($function, $file = "") { * called by something on $path, if false the whole call stack is * searched. * - * @todo Again, very neat, but is it necessary? - * * @return void + * + * @deprecated 1.8 A neat but pointless function */ function callpath_gatekeeper($path, $include_subdirs = true, $strict_mode = false) { + elgg_deprecated_notice("callpath_gatekeeper() is neat but pointless", 1.8); + global $CONFIG; $path = sanitise_string($path); diff --git a/engine/lib/users.php b/engine/lib/users.php index 62f2bdcc8..9ed3d0863 100644 --- a/engine/lib/users.php +++ b/engine/lib/users.php @@ -889,19 +889,17 @@ function send_new_password_request($user_guid) { function force_user_password_reset($user_guid, $password) { global $CONFIG; - if (call_gatekeeper('execute_new_password_request', __FILE__)) { - $user = get_entity($user_guid); + $user = get_entity($user_guid); - if ($user) { - $salt = generate_random_cleartext_password(); // Reset the salt - $user->salt = $salt; + if ($user) { + $salt = generate_random_cleartext_password(); // Reset the salt + $user->salt = $salt; - $hash = generate_user_password($user, $password); + $hash = generate_user_password($user, $password); - $query = "UPDATE {$CONFIG->dbprefix}users_entity - set password='$hash', salt='$salt' where guid=$user_guid"; - return update_data($query); - } + $query = "UPDATE {$CONFIG->dbprefix}users_entity + set password='$hash', salt='$salt' where guid=$user_guid"; + return update_data($query); } return false; |