diff options
| author | Julius Härtl <jus@bitgrid.net> | 2021-06-16 09:07:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-16 09:07:40 +0200 |
| commit | 437d938e8cf0b37fb3fc7893251f1470b9233fa0 (patch) | |
| tree | 8f404cbdf19e14601a08313193c62e620c8485b3 /apps/files_trashbin | |
| parent | 4c60ff127554020ceeac1ca0e7403dbad4295018 (diff) | |
| parent | 362cb2a11f7a95762ecfc7662768442bca233018 (diff) | |
| download | nextcloud-server-437d938e8cf0b37fb3fc7893251f1470b9233fa0.tar.gz nextcloud-server-437d938e8cf0b37fb3fc7893251f1470b9233fa0.zip | |
Merge pull request #26874 from nextcloud/single-query-search
Diffstat (limited to 'apps/files_trashbin')
| -rw-r--r-- | apps/files_trashbin/lib/Trashbin.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/apps/files_trashbin/lib/Trashbin.php b/apps/files_trashbin/lib/Trashbin.php index 1cef0a6ed0a..0e16c56ed8d 100644 --- a/apps/files_trashbin/lib/Trashbin.php +++ b/apps/files_trashbin/lib/Trashbin.php @@ -988,8 +988,7 @@ class Trashbin { $query = new CacheQueryBuilder( \OC::$server->getDatabaseConnection(), \OC::$server->getSystemConfig(), - \OC::$server->getLogger(), - $cache + \OC::$server->getLogger() ); $normalizedParentPath = ltrim(Filesystem::normalizePath(dirname('files_trashbin/versions/'. $filename)), '/'); $parentId = $cache->getId($normalizedParentPath); @@ -998,7 +997,7 @@ class Trashbin { } $query->selectFileCache() - ->whereStorageId() + ->whereStorageId($cache->getNumericStorageId()) ->andWhere($query->expr()->eq('parent', $query->createNamedParameter($parentId))) ->andWhere($query->expr()->iLike('name', $query->createNamedParameter($pattern))); |