diff options
| author | Robin Appelman <robin@icewind.nl> | 2021-05-04 19:06:02 +0200 |
|---|---|---|
| committer | Robin Appelman <robin@icewind.nl> | 2021-06-14 16:11:22 +0200 |
| commit | e198dc1b200f3ade93498e0ea7b468c87d46748a (patch) | |
| tree | 235c30d6035bec46bef5ee2f2b134333dfb65409 /apps/files_trashbin | |
| parent | dfbac05f7ba00c78ac15df61a425317a890b08d1 (diff) | |
| download | nextcloud-server-e198dc1b200f3ade93498e0ea7b468c87d46748a.tar.gz nextcloud-server-e198dc1b200f3ade93498e0ea7b468c87d46748a.zip | |
rework search api to allow searching on multiple caches at once
Signed-off-by: Robin Appelman <robin@icewind.nl>
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))); |