summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2019-11-13 14:02:52 +0100
committerGitHub <noreply@github.com>2019-11-13 14:02:52 +0100
commit2c8554e0906730d205f06d5f29f2ae9e249c3e37 (patch)
tree01c869c89ebfa787f81107a717795e55034e98b2
parent49d3e0f4a33c1d7a0527da8a82237f6e61d5b4f7 (diff)
parent4a09899ad839a5170153e6113c59a5b99a3a2aa2 (diff)
downloadnextcloud-server-2c8554e0906730d205f06d5f29f2ae9e249c3e37.tar.gz
nextcloud-server-2c8554e0906730d205f06d5f29f2ae9e249c3e37.zip
Merge pull request #17916 from nextcloud/backport/17735/stable17
[stable17] Fix reshare with circle
-rw-r--r--lib/private/Share20/Manager.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php
index 2e8e6f9a3af..33a6553172c 100644
--- a/lib/private/Share20/Manager.php
+++ b/lib/private/Share20/Manager.php
@@ -302,6 +302,7 @@ class Manager implements IManager {
/* Check if this is an incoming share */
$incomingShares = $this->getSharedWith($share->getSharedBy(), Share::SHARE_TYPE_USER, $userMountPoint, -1, 0);
$incomingShares = array_merge($incomingShares, $this->getSharedWith($share->getSharedBy(), Share::SHARE_TYPE_GROUP, $userMountPoint, -1, 0));
+ $incomingShares = array_merge($incomingShares, $this->getSharedWith($share->getSharedBy(), Share::SHARE_TYPE_CIRCLE, $userMountPoint, -1, 0));
$incomingShares = array_merge($incomingShares, $this->getSharedWith($share->getSharedBy(), Share::SHARE_TYPE_ROOM, $userMountPoint, -1, 0));
/** @var \OCP\Share\IShare[] $incomingShares */