diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2019-10-05 15:18:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-05 15:18:37 +0200 |
| commit | 637c50e647d4d47d79248497d80ad63a20c09fd6 (patch) | |
| tree | 872485289902d9f7b0568ed6bfe69a8bc403158e | |
| parent | a32c9cc26039436987a4db8dd0ef71987c8cb2ba (diff) | |
| parent | 22f6960f8397c3f6a60b04097ad77b281ad033f4 (diff) | |
| download | nextcloud-server-637c50e647d4d47d79248497d80ad63a20c09fd6.tar.gz nextcloud-server-637c50e647d4d47d79248497d80ad63a20c09fd6.zip | |
Merge pull request #17387 from nextcloud/fix/remove/federated_share
Allow removing federated shares of locally reshared files
| -rw-r--r-- | apps/federatedfilesharing/lib/FederatedShareProvider.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/apps/federatedfilesharing/lib/FederatedShareProvider.php b/apps/federatedfilesharing/lib/FederatedShareProvider.php index f0ec9e3cb68..67089cba9d3 100644 --- a/apps/federatedfilesharing/lib/FederatedShareProvider.php +++ b/apps/federatedfilesharing/lib/FederatedShareProvider.php @@ -563,6 +563,11 @@ class FederatedShareProvider implements IShareProvider { * @throws \OC\HintException */ protected function revokeShare($share, $isOwner) { + if ($this->userManager->userExists($share->getShareOwner() && $this->userManager->userExists($share->getSharedBy()))) { + // If both the owner and the initiator of the share are local users we don't have to notify anybody else + return; + } + // also send a unShare request to the initiator, if this is a different user than the owner if ($share->getShareOwner() !== $share->getSharedBy()) { if ($isOwner) { |