diff options
| author | Robin Appelman <robin@icewind.nl> | 2024-03-06 19:08:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-06 19:08:41 +0100 |
| commit | abfbe67ec950c553a16698c485b6858edcdb6919 (patch) | |
| tree | 0f0e076cd7adb26df908280dc688632f851608cc /apps | |
| parent | dfae067bbc8f794299b0933785ea34b816c2311f (diff) | |
| parent | bfeb97c54a5de25493ff1fa4fd36ae1aa2acec49 (diff) | |
| download | nextcloud-server-abfbe67ec950c553a16698c485b6858edcdb6919.tar.gz nextcloud-server-abfbe67ec950c553a16698c485b6858edcdb6919.zip | |
Merge pull request #42638 from nextcloud/shares-in-folder-storage
also filter by storage when getting shares in folder
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/federatedfilesharing/lib/FederatedShareProvider.php | 3 | ||||
| -rw-r--r-- | apps/sharebymail/lib/ShareByMailProvider.php | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/apps/federatedfilesharing/lib/FederatedShareProvider.php b/apps/federatedfilesharing/lib/FederatedShareProvider.php index 45efd0c7c8a..340de3a1761 100644 --- a/apps/federatedfilesharing/lib/FederatedShareProvider.php +++ b/apps/federatedfilesharing/lib/FederatedShareProvider.php @@ -605,8 +605,9 @@ class FederatedShareProvider implements IShareProvider { $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()))); + $qb->andWhere($qb->expr()->eq('f.parent', $qb->createNamedParameter($node->getId(), IQueryBuilder::PARAM_INT))); } else { $qb->andWhere($qb->expr()->like('f.path', $qb->createNamedParameter($this->dbConnection->escapeLikeParameter($node->getInternalPath()) . '/%'))); } diff --git a/apps/sharebymail/lib/ShareByMailProvider.php b/apps/sharebymail/lib/ShareByMailProvider.php index 1c7b716e1e4..5a840b895ff 100644 --- a/apps/sharebymail/lib/ShareByMailProvider.php +++ b/apps/sharebymail/lib/ShareByMailProvider.php @@ -1069,6 +1069,7 @@ class ShareByMailProvider implements IShareProvider { $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 { |