Remove limit and offset manipulation when getting users or groups, because it does...

diff --git a/lib/private/group/group.php b/lib/private/group/group.php
index a2b8a0dcbea7077391e6007fcb842380a8b88ae9..3efbb6e70231e9fbb4c10ae600305bea521ff199 100644 (file)
--- a/lib/private/group/group.php
+++ b/lib/private/group/group.php
@@ -172,12 +172,6 @@ class Group {
                $users = array();
                foreach ($this->backends as $backend) {
                        $userIds = $backend->usersInGroup($this->gid, $search, $limit, $offset);
-                       if (!is_null($limit)) {
-                               $limit -= count($userIds);
-                       }
-                       if (!is_null($offset)) {
-                               $offset -= count($userIds);
-                       }
                        $users += $this->getVerifiedUsers($userIds);
                        if (!is_null($limit) and $limit <= 0) {
                                return array_values($users);
@@ -223,12 +217,6 @@ class Group {
                        } else {
                                $userIds = $backend->usersInGroup($this->gid, $search, $limit, $offset);
                        }
-                       if (!is_null($limit)) {
-                               $limit -= count($userIds);
-                       }
-                       if (!is_null($offset)) {
-                               $offset -= count($userIds);
-                       }
                        $users = $this->getVerifiedUsers($userIds);
                        if (!is_null($limit) and $limit <= 0) {
                                return array_values($users);

diff --git a/lib/private/group/manager.php b/lib/private/group/manager.php
index 9b433b64fd4825b5b8c0be777d7026a4e8d6b7f6..f591bd32aba71405cb4eea64a38b2f3d5bd70dee 100644 (file)
--- a/lib/private/group/manager.php
+++ b/lib/private/group/manager.php
@@ -134,12 +134,6 @@ class Manager extends PublicEmitter {
                $groups = array();
                foreach ($this->backends as $backend) {
                        $groupIds = $backend->getGroups($search, $limit, $offset);
-                       if (!is_null($limit)) {
-                               $limit -= count($groupIds);
-                       }
-                       if (!is_null($offset)) {
-                               $offset -= count($groupIds);
-                       }
                        foreach ($groupIds as $groupId) {
                                $groups[$groupId] = $this->getGroupObject($groupId);
                        }

diff --git a/lib/private/user/manager.php b/lib/private/user/manager.php
index a2ad9d17702cfc51caa9335a626da3add82cc73c..14698452e88f8f304dfc61fcb8110977ecc825d9 100644 (file)
--- a/lib/private/user/manager.php
+++ b/lib/private/user/manager.php
@@ -175,13 +175,6 @@ class Manager extends PublicEmitter {
                        if (is_array($backendUsers)) {
                                foreach ($backendUsers as $uid) {
                                        $users[] = $this->getUserObject($uid, $backend);
-                                       if (!is_null($limit)) {
-                                               $limit--;
-                                       }
-                                       if (!is_null($offset) and $offset > 0) {
-                                               $offset--;
-                                       }
-
                                }
                        }
                }
@@ -211,13 +204,6 @@ class Manager extends PublicEmitter {
                        if (is_array($backendUsers)) {
                                foreach ($backendUsers as $uid => $displayName) {
                                        $users[] = $this->getUserObject($uid, $backend);
-                                       if (!is_null($limit)) {
-                                               $limit--;
-                                       }
-                                       if (!is_null($offset) and $offset > 0) {
-                                               $offset--;
-                                       }
-
                                }
                        }
                }