offset needs to be considered in computed limit

This commit is contained in:
Arthur Schiwon 2015-03-23 16:51:40 +01:00
parent 0e4ba618cf
commit 7520d0fb3d
2 changed files with 15 additions and 1 deletions

View File

@ -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;
}

View File

@ -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));
}
}