Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixes #2468: Deprecated call_gatekeeper() and callpath_gatekeeper()

git-svn-id: http://code.elgg.org/elgg/trunk@7369 36083f99-b078-4883-b0ff-0f9b5a30f544
  • Loading branch information...
commit 863c7044a223d101b29e630d048d0f53580f4096 1 parent 9f41e8b
Evan Winslow ewinslow authored
Showing with 15 additions and 13 deletions.
  1. +7 −3 engine/lib/elgglib.php
  2. +8 −10 engine/lib/users.php
10 engine/lib/elgglib.php
View
@@ -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);
18 engine/lib/users.php
View
@@ -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;
Please sign in to comment.
Something went wrong with that request. Please try again.