upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-08 00:02:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 33

Merge pull request #31924 from nextcloud/backport/31610/stable22

Browse source 
[stable22] fix shared mount roots not being returned from `getSharesInFolder`
This commit is contained in:
blizzz 2022-04-13 20:06:26 +02:00 committed by GitHub
commit a0a079d56e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/private/Share20/DefaultShareProvider.php
View file

@ -666,8 +666,21 @@ class DefaultShareProvider implements IShareProvider {
);
}
// todo? maybe get these from the oc_mounts table
$childMountNodes = array_filter($node->getDirectoryListing(), function (Node $node) {
return $node->getInternalPath() === '';
});
$childMountRootIds = array_map(function (Node $node) {
return $node->getId();
}, $childMountNodes);
$qb->innerJoin('s', 'filecache', 'f', $qb->expr()->eq('s.file_source', 'f.fileid'));
$qb->andWhere($qb->expr()->eq('f.parent', $qb->createNamedParameter($node->getId())));
$qb->andWhere(
$qb->expr()->orX(
$qb->expr()->eq('f.parent', $qb->createNamedParameter($node->getId())),
$qb->expr()->in('f.fileid', $qb->createNamedParameter($childMountRootIds, IQueryBuilder::PARAM_INT_ARRAY))
)
);
$qb->orderBy('id');