Skip to content

Commit 6e190b1

Browse files
authored
Merge pull request #27303 from nextcloud/backport/27062/stable21
[stable21] properly use limit and offset for search in Jail wrapper
2 parents 3708360 + a21eb8d commit 6e190b1

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

lib/private/Files/Cache/Wrapper/CacheJail.php

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -318,14 +318,9 @@ public function searchQuery(ISearchQuery $query) {
318318
ISearchBinaryOperator::OPERATOR_AND,
319319
[new SearchBinaryOperator(ISearchBinaryOperator::OPERATOR_OR, [$prefixFilter, $rootFilter]) , $query->getSearchOperation()]
320320
);
321-
$simpleQuery = new SearchQuery($operation, 0, 0, $query->getOrder(), $query->getUser());
321+
$simpleQuery = new SearchQuery($operation, $query->getLimit(), $query->getOffset(), $query->getOrder(), $query->getUser());
322322
$results = $this->getCache()->searchQuery($simpleQuery);
323-
$results = $this->formatSearchResults($results);
324-
325-
$limit = $query->getLimit() === 0 ? null : $query->getLimit();
326-
$results = array_slice($results, $query->getOffset(), $limit);
327-
328-
return $results;
323+
return $this->formatSearchResults($results);
329324
}
330325

331326
/**

0 commit comments

Comments
 (0)