summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoeland Jago Douma <roeland@famdouma.nl>2019-02-13 21:27:25 +0100
committerBackportbot <backportbot-noreply@rullzer.com>2019-02-14 10:27:43 +0000
commit8373adacd6cc825d7a3b415640363cb7aa226c87 (patch)
tree3991d879f17dd02583ca384b44dff31db0ef947a
parente31c94ac6433e1c99ab5ea981cd6c38d4d54b46b (diff)
downloadnextcloud-server-8373adacd6cc825d7a3b415640363cb7aa226c87.tar.gz
nextcloud-server-8373adacd6cc825d7a3b415640363cb7aa226c87.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);