From a5a92ae74e11116fdb4833fd1f7ff5bbb8724ad0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rapha=C3=ABl=20Barrois?= Date: Fri, 19 Mar 2010 17:37:50 +0100 Subject: [PATCH] Flatten results yielded by the various ProfileFields MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Raphaël Barrois --- include/profilefields.inc.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/include/profilefields.inc.php b/include/profilefields.inc.php index 486016f..5b53a0e 100644 --- a/include/profilefields.inc.php +++ b/include/profilefields.inc.php @@ -428,7 +428,7 @@ class ProfileNetworking extends ProfileField break; } } - return PlIteratorUtils::fromArray($nws); + return PlIteratorUtils::fromArray($nws, 1, true); } } // }}} @@ -528,7 +528,7 @@ class ProfileAddresses extends ProfileField break; } } - return PlIteratorUtils::fromArray($res); + return PlIteratorUtils::fromArray($res, 1, true); } public static function fetchData(array $pids, $visibility) @@ -584,7 +584,7 @@ class ProfilePhones extends ProfileField break; } } - return PlIteratorUtils::fromArray($phones); + return PlIteratorUtils::fromArray($phones, 1, true); } public static function fetchData(array $pids, $visibility) @@ -605,8 +605,9 @@ class ProfileJobs extends ProfileField { private $jobs = array(); - public function __construct(PlIterator $jobs) + public function __construct(PlInnerSubIterator $jobs) { + $this->pid = $jobs->value(); while ($job = $jobs->next()) { $this->jobs[$job['id']] = new Job($job); } @@ -641,7 +642,7 @@ class ProfileJobs extends ProfileField break; } } - return PlIteratorUtils::fromArray($jobs); + return PlIteratorUtils::fromArray($jobs, 1, true); } public function addPhones(ProfilePhones $phones) -- 2.1.4