ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #3942 from nextcloud/bugfix/noid/fix-share-provider

Browse Source 
Fix share provider for master changes
This commit is contained in:
Julius Härtl
2022-07-29 22:42:14 +02:00
committed by GitHub
parent 3b1bae3775 ff39027869
commit f5fd8c9fe5
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Sharing/DeckShareProvider.php
View File

@@ -489,7 +489,7 @@ class DeckShareProvider implements \OCP\Share\IShareProvider {
* @inheritDoc * @inheritDoc
* @returns * @returns
*/ */
public function getSharesInFolder($userId, Folder $node, $reshares) { public function getSharesInFolder($userId, Folder $node, $reshares, $shallow = true) {
$qb = $this->dbConnection->getQueryBuilder(); $qb = $this->dbConnection->getQueryBuilder();
$qb->select('*') $qb->select('*')
->from('share', 's') ->from('share', 's')
@@ -516,7 +516,11 @@ class DeckShareProvider implements \OCP\Share\IShareProvider {
} }
$qb->innerJoin('s', 'filecache', 'f', $qb->expr()->eq('s.file_source', 'f.fileid')); $qb->innerJoin('s', 'filecache', 'f', $qb->expr()->eq('s.file_source', 'f.fileid'));
$qb->andWhere($qb->expr()->eq('f.parent', $qb->createNamedParameter($node->getId()))); if ($shallow) {
$qb->andWhere($qb->expr()->eq('f.parent', $qb->createNamedParameter($node->getId())));
} else {
$qb->andWhere($qb->expr()->like('f.path', $qb->createNamedParameter($this->dbConnection->escapeLikeParameter($node->getInternalPath()) . '/%')));
}
$qb->orderBy('s.id'); $qb->orderBy('s.id');