From 7a8da8e83d51f52bad9d84273437b6f8e494c921 Mon Sep 17 00:00:00 2001 From: Pascal Corpet Date: Thu, 10 Jun 2010 00:47:37 +0200 Subject: [PATCH] Fixes iterating over profiles of users when all profiles are null. --- classes/profile.php | 2 +- classes/user.php | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/classes/profile.php b/classes/profile.php index 663f2f7..9aeef1d 100644 --- a/classes/profile.php +++ b/classes/profile.php @@ -766,7 +766,7 @@ class Profile private static function fetchProfileData(array $pids, $respect_order = true, $fields = 0x0000, $visibility = null) { if (count($pids) == 0) { - return array(); + return null; } if ($respect_order) { diff --git a/classes/user.php b/classes/user.php index 9d95fa4..8761ee7 100644 --- a/classes/user.php +++ b/classes/user.php @@ -733,7 +733,11 @@ class User extends PlUser $table = array(); if ($fetchProfile) { $profiles = Profile::iterOverUIDS($uids, true); - $profile = $profiles->next(); + if ($profiles != null) { + $profile = $profiles->next(); + } else { + $profile = null; + } } /** We iterate through the users, moving in @@ -743,7 +747,7 @@ class User extends PlUser */ while (($user = $users->next())) { if ($fetchProfile) { - if ($profile->owner_id == $user->id()) { + if ($profile != null && $profile->owner_id == $user->id()) { $user->_profile = $profile; $profile = $profiles->next(); } -- 2.1.4