summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoeland Jago Douma <roeland@famdouma.nl>2019-02-13 21:27:25 +0100
committerRoeland Jago Douma <roeland@famdouma.nl>2019-02-13 21:27:25 +0100
commit62ddb124a1821e5657e1414525dbbb6ae19a0700 (patch)
treecb7301f9989e9c1f02f736d1c800507ad1cca40b
parentcb67c6aa003c41339bf68683bd1cd2855baed44d (diff)
downloadnextcloud-server-62ddb124a1821e5657e1414525dbbb6ae19a0700.tar.gz
nextcloud-server-62ddb124a1821e5657e1414525dbbb6ae19a0700.zip
Filter out versions and trashbin
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
-rw-r--r--lib/private/Files/Node/Folder.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/private/Files/Node/Folder.php b/lib/private/Files/Node/Folder.php
index 9051862eadd..a9b443ce52e 100644
--- a/lib/private/Files/Node/Folder.php
+++ b/lib/private/Files/Node/Folder.php
@@ -411,6 +411,8 @@ class Folder extends Node implements \OCP\Files\Folder {
$builder->expr()->neq('f.mimetype', $builder->createNamedParameter($folderMimetype, IQueryBuilder::PARAM_INT)),
$builder->expr()->eq('f.size', new Literal(0))
))
+ ->andWhere($builder->expr()->notLike('f.path', $builder->createNamedParameter('files_versions/%')))
+ ->andWhere($builder->expr()->notLike('f.path', $builder->createNamedParameter('files_trashbin/%')))
->orderBy('f.mtime', 'DESC')
->setMaxResults($limit)
->setFirstResult($offset);