Skip to content

Commit f5fd8c9

Browse files
authored
Merge pull request #3942 from nextcloud/bugfix/noid/fix-share-provider
Fix share provider for master changes
2 parents 3b1bae3 + ff39027 commit f5fd8c9

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

lib/Sharing/DeckShareProvider.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,7 @@ public function move(IShare $share, $recipient) {
489489
* @inheritDoc
490490
* @returns
491491
*/
492-
public function getSharesInFolder($userId, Folder $node, $reshares) {
492+
public function getSharesInFolder($userId, Folder $node, $reshares, $shallow = true) {
493493
$qb = $this->dbConnection->getQueryBuilder();
494494
$qb->select('*')
495495
->from('share', 's')
@@ -516,7 +516,11 @@ public function getSharesInFolder($userId, Folder $node, $reshares) {
516516
}
517517

518518
$qb->innerJoin('s', 'filecache', 'f', $qb->expr()->eq('s.file_source', 'f.fileid'));
519-
$qb->andWhere($qb->expr()->eq('f.parent', $qb->createNamedParameter($node->getId())));
519+
if ($shallow) {
520+
$qb->andWhere($qb->expr()->eq('f.parent', $qb->createNamedParameter($node->getId())));
521+
} else {
522+
$qb->andWhere($qb->expr()->like('f.path', $qb->createNamedParameter($this->dbConnection->escapeLikeParameter($node->getInternalPath()) . '/%')));
523+
}
520524

521525
$qb->orderBy('s.id');
522526

0 commit comments

Comments
 (0)