Merge pull request #5452 from nextcloud/shares-in-folder-storage

juliusknorr · web-flow · commit 83348d12a471 · 2024-01-11T08:55:59.000+01:00
also filter by storage when getting shares in folder
diff --git a/lib/Sharing/DeckShareProvider.php b/lib/Sharing/DeckShareProvider.php
@@ -516,6 +516,7 @@ public function getSharesInFolder($userId, Folder $node, $reshares, $shallow = t
 		}
 
 		$qb->innerJoin('s', 'filecache', 'f', $qb->expr()->eq('s.file_source', 'f.fileid'));
+		$qb->andWhere($qb->expr()->eq('f.storage', $qb->createNamedParameter($node->getMountPoint()->getNumericStorageId(), IQueryBuilder::PARAM_INT)));
 		if ($shallow) {
 			$qb->andWhere($qb->expr()->eq('f.parent', $qb->createNamedParameter($node->getId())));
 		} else {

Original file line number	Diff line number	Diff line change
`@@ -516,6 +516,7 @@ public function getSharesInFolder($userId, Folder $node, $reshares, $shallow = t`
`516`	`516`	`}`
`517`	`517`
`518`	`518`	`$qb->innerJoin('s', 'filecache', 'f', $qb->expr()->eq('s.file_source', 'f.fileid'));`
	`519`	`+ $qb->andWhere($qb->expr()->eq('f.storage', $qb->createNamedParameter($node->getMountPoint()->getNumericStorageId(), IQueryBuilder::PARAM_INT)));`
`519`	`520`	`if ($shallow) {`
`520`	`521`	`$qb->andWhere($qb->expr()->eq('f.parent', $qb->createNamedParameter($node->getId())));`
`521`	`522`	`} else {`