Skip to content

[stable14] Fix recent files #14196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rullzer merged 3 commits into from
Feb 14, 2019
Merged

[stable14] Fix recent files #14196

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7dbcdda
We need to initialize the storage else the jailed path is always null
rullzer Feb 13, 2019
d97adfe
Loop for the recent search
rullzer Feb 13, 2019
3bc0990
Filter out versions and trashbin
rullzer Feb 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Filter out versions and trashbin 
Signed-off-by: Roeland Jago Douma <[email protected]>
  • Loading branch information
@rullzer
rullzer authored and Backportbot committed Feb 14, 2019
commit 3bc0990749c682d87acb3c15d292705bc9d85ca4
2 changes: 2 additions & 0 deletions lib/private/Files/Node/Folder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,6 +411,8 @@ private function recentSearch($limit, $offset, $storageIds, $folderMimetype) {
$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);
Expand Down