diff options
| author | Vincent Petry <vincent@nextcloud.com> | 2021-05-25 15:47:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-25 15:47:09 +0200 |
| commit | 0815be1ca85698bf571b8e907056274499226335 (patch) | |
| tree | eb67ee9d463f090274cfb3a333aade4ca40a1ff8 | |
| parent | 333665b43d79aa5a83d112748583c1a59cc76a5b (diff) | |
| parent | 7ee528fc5a58f2bffe58d3f0912234a056e425c8 (diff) | |
| download | nextcloud-server-0815be1ca85698bf571b8e907056274499226335.tar.gz nextcloud-server-0815be1ca85698bf571b8e907056274499226335.zip | |
Merge pull request #27062 from nextcloud/search-limit-offset-jail
properly use limit and offset for search in Jail wrapper
| -rw-r--r-- | lib/private/Files/Cache/Wrapper/CacheJail.php | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/lib/private/Files/Cache/Wrapper/CacheJail.php b/lib/private/Files/Cache/Wrapper/CacheJail.php index fe3124301ba..0d8b776fa30 100644 --- a/lib/private/Files/Cache/Wrapper/CacheJail.php +++ b/lib/private/Files/Cache/Wrapper/CacheJail.php @@ -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); } /** |