From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Sun, 14 Feb 2010 10:34:35 +0000 (+0100)
Subject: Makes $limit argument optional.
X-Git-Tag: xorg/1.0.0~332^2~234
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=434570c4360c7f38088ce1e7b42cb9d3ed3a0507;p=platal.git

Makes $limit argument optional.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
---

diff --git a/classes/userfilter.php b/classes/userfilter.php
index db2111b..7df8762 100644
--- a/classes/userfilter.php
+++ b/classes/userfilter.php
@@ -1574,6 +1574,14 @@ class UserFilter extends PlFilter
         return $fetched;
     }
 
+    private static function defaultLimit($limit) {
+        if ($limit == null) {
+            return new PlLimit();
+        } else {
+            return $limit;
+        }
+    }
+
     /** Check that the user match the given rule.
      */
     public function checkUser(PlUser &$user)
@@ -1598,15 +1606,16 @@ class UserFilter extends PlFilter
 
     /** Default filter is on users
      */
-    public function filter(array $users, PlLimit &$limit)
+    public function filter(array $users, $limit = null)
     {
-        return $this->filterUsers($users, $limit);
+        return $this->filterUsers($users, self::defaultLimit($limit));
     }
 
     /** Filter a list of users to extract the users matching the rule.
      */
-    public function filterUsers(array $users, PlLimit &$limit)
+    public function filterUsers(array $users, $limit = null)
     {
+        $limit = self::defaultLimit($limit);
         $this->requireAccounts();
         $this->buildQuery();
         $table = array();
@@ -1630,8 +1639,9 @@ class UserFilter extends PlFilter
 
     /** Filter a list of profiles to extract the users matching the rule.
      */
-    public function filterProfiles(array $profiles, PlLimit &$limit)
+    public function filterProfiles(array $profiles, $limit = null)
     {
+        $limit = self::defaultLimit($limit);
         $this->requireProfiles();
         $this->buildQuery();
         $table = array();
@@ -1653,27 +1663,27 @@ class UserFilter extends PlFilter
         return $output;
     }
 
-    public function getUIDs(PlLimit &$limit)
+    public function getUIDs($limit = null)
     {
-        return $this->getUIDList(null, $limit);
+        return $this->getUIDList(null, self::defaultLimit($limit));
     }
 
-    public function getPIDs(PlLimit &$limit)
+    public function getPIDs($limit = null)
     {
-        return $this->getPIDList(null, $limit);
+        return $this->getPIDList(null, self::defaultLimit($limit));
     }
 
-    public function getUsers(PlLimit &$limit)
+    public function getUsers($limit = null)
     {
         return User::getBulkUsersWithUIDs($this->getUIDs($limit));
     }
 
-    public function getProfiles(PlLimit &$limit)
+    public function getProfiles($limit = null)
     {
         return Profile::getBulkProfilesWithPIDs($this->getPIDs($limit));
     }
 
-    public function get(PlLimit &$limit)
+    public function get($limit = null)
     {
         return $this->getUsers($limit);
     }
@@ -2474,7 +2484,7 @@ class UserFilter extends PlFilter
 // {{{ class ProfileFilter
 class ProfileFilter extends UserFilter
 {
-    public function get(PlLimit &$limit)
+    public function get($limit = null)
     {
         return $this->getProfiles($limit);
     }
diff --git a/core b/core
index 54d6549..e174681 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 54d6549cad8056b1f0656b2d8fc83a853631758e
+Subproject commit e1746810b6aeaba3332ff99acdbf7ff3c2e9ada6