From: Steve Clay <steve@mrclay.org>
Date: Tue, 5 Feb 2013 02:01:57 +0000 (-0500)
Subject: Check for ElggUser in functions that pass in user's GUID
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=b78bbc030f432276516d693de7cddcea05eff807;p=lorea%2Felgg.git

Check for ElggUser in functions that pass in user's GUID
---

diff --git a/engine/lib/users.php b/engine/lib/users.php
index 8e9086f57..ffff4aaa5 100644
--- a/engine/lib/users.php
+++ b/engine/lib/users.php
@@ -676,7 +676,7 @@ function send_new_password_request($user_guid) {
 	$user_guid = (int)$user_guid;
 
 	$user = get_entity($user_guid);
-	if ($user) {
+	if ($user instanceof ElggUser) {
 		/* @var ElggUser $user */
 
 		// generate code
@@ -710,9 +710,9 @@ function force_user_password_reset($user_guid, $password) {
 	global $CONFIG;
 
 	$user = get_entity($user_guid);
+	if ($user instanceof ElggUser) {
 		/* @var ElggUser $user */
 
-	if ($user) {
 		$salt = generate_random_cleartext_password(); // Reset the salt
 		$user->salt = $salt;
 
@@ -740,7 +740,7 @@ function execute_new_password_request($user_guid, $conf_code) {
 	$user_guid = (int)$user_guid;
 	$user = get_entity($user_guid);
 
-	if ($user) {
+	if ($user instanceof ElggUser) {
 		/* @var ElggUser $user */
 		$saved_code = $user->getPrivateSetting('passwd_conf_code');