summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2016-06-27 09:58:13 +0200
committerGitHub <noreply@github.com>2016-06-27 09:58:13 +0200
commitf65787ffdcfd4d6d112e27e11fb108fdfd5f69b9 (patch)
tree8890613b208864b6b9f79a9ae137d9dd3ccb991e /apps
parent3a7b9fc41d7df361186115e7d06d5854efed1ed0 (diff)
parent040c5411386d05f64c6dc2a6e3d52ba5c3af9f96 (diff)
downloadnextcloud-server-f65787ffdcfd4d6d112e27e11fb108fdfd5f69b9.tar.gz
nextcloud-server-f65787ffdcfd4d6d112e27e11fb108fdfd5f69b9.zip
Merge pull request #25247 from owncloud/fed-unshare-fail
Remove a fed share from the local table before trying to notify the remote server
Diffstat (limited to 'apps')
-rw-r--r--apps/federatedfilesharing/lib/FederatedShareProvider.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/federatedfilesharing/lib/FederatedShareProvider.php b/apps/federatedfilesharing/lib/FederatedShareProvider.php
index 4892908c329..01737256769 100644
--- a/apps/federatedfilesharing/lib/FederatedShareProvider.php
+++ b/apps/federatedfilesharing/lib/FederatedShareProvider.php
@@ -473,6 +473,8 @@ class FederatedShareProvider implements IShareProvider {
$isOwner = false;
+ $this->removeShareFromTable($share);
+
// if the local user is the owner we can send the unShare request directly...
if ($this->userManager->userExists($share->getShareOwner())) {
$this->notifications->sendRemoteUnShare($remote, $share->getId(), $share->getToken());
@@ -494,8 +496,6 @@ class FederatedShareProvider implements IShareProvider {
}
$this->notifications->sendRevokeShare($remote, $remoteId, $share->getToken());
}
-
- $this->removeShareFromTable($share);
}
/**