sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #27303 from nextcloud/backport/27062/stable21 

[stable21] properly use limit and offset for search in Jail wrapper
pull/27446/head
Julius Härtl 2021-06-09 08:07:49 +07:00 committed by GitHub
parent 3708360f3b a21eb8d6d2
commit 6e190b1a55
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/private/Files/Cache/Wrapper/CacheJail.php
Unescape Escape View File

@ -318,14 +318,9 @@ class CacheJail extends CacheWrapper {
ISearchBinaryOperator::OPERATOR_AND,
[new SearchBinaryOperator(ISearchBinaryOperator::OPERATOR_OR, [$prefixFilter, $rootFilter]) , $query->getSearchOperation()]
);
$simpleQuery = new SearchQuery($operation, 0, 0, $query->getOrder(), $query->getUser());
$simpleQuery = new SearchQuery($operation, $query->getLimit(), $query->getOffset(), $query->getOrder(), $query->getUser());
$results = $this->getCache()->searchQuery($simpleQuery);
$results = $this->formatSearchResults($results);
$limit = $query->getLimit() === 0 ? null : $query->getLimit();
$results = array_slice($results, $query->getOffset(), $limit);
return $results;
return $this->formatSearchResults($results);
}
/**