aboutsummaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authorSteve Clay <steve@mrclay.org>2013-02-04 21:01:57 -0500
committercash <cash.costello@gmail.com>2013-02-09 09:26:32 -0500
commitb78bbc030f432276516d693de7cddcea05eff807 (patch)
tree674e399d2202012c9f66751c2360d194737fdb2e /engine
parent359571fec63b62a666413f507775aeb17cd55f37 (diff)
downloadelgg-b78bbc030f432276516d693de7cddcea05eff807.tar.gz
elgg-b78bbc030f432276516d693de7cddcea05eff807.tar.bz2
Check for ElggUser in functions that pass in user's GUID
Diffstat (limited to 'engine')
-rw-r--r--engine/lib/users.php6
1 files changed, 3 insertions, 3 deletions
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');