Skip to content

Commit 728e5ef

Browse files
authored
Merge pull request #27307 from nextcloud/backport/27062/stable19
[stable19] properly use limit and offset for search in Jail wrapper
2 parents ac4c7a3 + 8246f09 commit 728e5ef

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
@@ -319,14 +319,9 @@ public function searchQuery(ISearchQuery $query) {
319319
ISearchBinaryOperator::OPERATOR_AND,
320320
[new SearchBinaryOperator(ISearchBinaryOperator::OPERATOR_OR, [$prefixFilter, $rootFilter]) , $query->getSearchOperation()]
321321
);
322-
$simpleQuery = new SearchQuery($operation, 0, 0, $query->getOrder(), $query->getUser());
322+
$simpleQuery = new SearchQuery($operation, $query->getLimit(), $query->getOffset(), $query->getOrder(), $query->getUser());
323323
$results = $this->getCache()->searchQuery($simpleQuery);
324-
$results = $this->formatSearchResults($results);
325-
326-
$limit = $query->getLimit() === 0 ? null : $query->getLimit();
327-
$results = array_slice($results, $query->getOffset(), $limit);
328-
329-
return $results;
324+
return $this->formatSearchResults($results);
330325
}
331326

332327
/**

0 commit comments

Comments
 (0)