Commit 8906158d authored by blizzz's avatar blizzz
Browse files

Merge pull request #15123 from owncloud/fix_14098

offset needs to be considered in computed limit
parents 02c0fe8d 7520d0fb
......@@ -673,7 +673,7 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
}
$maxGroups = 100000; // limit max results (just for safety reasons)
if ($limit > -1) {
$overallLimit = min($limit, $maxGroups);
$overallLimit = min($limit + $offset, $maxGroups);
} else {
$overallLimit = $maxGroups;
}
......
......@@ -298,4 +298,18 @@ class Test_Group_Ldap extends \Test\TestCase {
$groupBackend->inGroup($uid, $gid);
}
public function testGetGroupsWithOffset() {
$access = $this->getAccessMock();
$this->enableGroups($access);
$access->expects($this->once())
->method('ownCloudGroupNames')
->will($this->returnValue(array('group1', 'group2')));
$groupBackend = new GroupLDAP($access);
$groups = $groupBackend->getGroups('', 2, 2);
$this->assertSame(2, count($groups));
}
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment