From: Pascal Corpet <pascal.corpet@m4x.org>
Date: Wed, 9 Jun 2010 22:47:37 +0000 (+0200)
Subject: Fixes iterating over profiles of users when all profiles are null.
X-Git-Tag: xorg/1.0.0~137
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=7a8da8e83d51f52bad9d84273437b6f8e494c921;p=platal.git

Fixes iterating over profiles of users when all profiles are null.
---

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();
                 }