Merge pull request #21571 from nextcloud/backport/21565/stable19

blizzz · web-flow · commit ca845138b753 · 2020-06-24T22:41:25.000+02:00
[stable19] comment was wrong, block is needed nevertheless
diff --git a/apps/user_ldap/lib/Access.php b/apps/user_ldap/lib/Access.php
@@ -2051,8 +2051,7 @@ private function initPagedSearch(
 				$this->search($filter, $base, $attr, $limit, $reOffset, true);
 				if (!$this->hasMoreResults()) {
 					// when the cookie is reset with != 0 offset, there are no further
-					// results, so stop. This if block is not necessary with new API
-					// and can be removed with dropping PHP 7.2
+					// results, so stop.
 					return false;
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -2051,8 +2051,7 @@ private function initPagedSearch(`
`2051`	`2051`	`$this->search($filter, $base, $attr, $limit, $reOffset, true);`
`2052`	`2052`	`if (!$this->hasMoreResults()) {`
`2053`	`2053`	`// when the cookie is reset with != 0 offset, there are no further`
`2054`		`- // results, so stop. This if block is not necessary with new API`
`2055`		`- // and can be removed with dropping PHP 7.2`
	`2054`	`+ // results, so stop.`
`2056`	`2055`	`return false;`
`2057`	`2056`	`}`
`2058`	`2057`	`}`