From 8467def7b77245ec935d6ce64cf6e031595ccaa7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rapha=C3=ABl=20Barrois?= Date: Mon, 22 Mar 2010 16:06:40 +0100 Subject: [PATCH] Use batch fetchers for search MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Raphaël Barrois --- core | 2 +- include/userset.inc.php | 12 ++---------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/core b/core index c291ca5..501a6db 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit c291ca5486bce705cd3dfd81065cbd2d92b96da5 +Subproject commit 501a6db205b3355bd9e15de6eac20ca033835201 diff --git a/include/userset.inc.php b/include/userset.inc.php index 73ba6c8..a403b8a 100644 --- a/include/userset.inc.php +++ b/include/userset.inc.php @@ -115,17 +115,9 @@ class SearchSet extends ProfileSet $this->conds->addChild($ufb->getUFC()); } - public function &get(PlLimit $limit = null, $orders = array()) + protected function &getFilterResults(PlFilter &$pf, PlLimit $limit) { - $orders = array_merge($orders, $this->orders); - - $uf = $this->buildFilter($this->conds, $orders); - if (is_null($limit)) { - $limit = new PlLimit(20, 0); - } - $it = $uf->getProfiles($limit); - $this->count = $uf->getTotalCount(); - return $it; + return $pf->getProfiles($limit, Profile::FETCH_MINIFICHES); } } -- 2.1.4