Merge pull request #31610 from nextcloud/shares-in-folder-mounts

fix shared mount roots not being returned from `getSharesInFolder`
nextcloud · Apr 11, 2022 · 0b8582f · 0b8582f
2 parents cde2605 + e83ad8c
commit 0b8582f
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/lib/private/Share20/DefaultShareProvider.php b/lib/private/Share20/DefaultShareProvider.php
@@ -670,8 +670,21 @@ public function getSharesInFolder($userId, Folder $node, $reshares) {
  );
  }
 
+ // 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');