Merge pull request #5753 from nextcloud/fed-unshare-fail-remote
still remove the federated share even if we cant notify the remote
This commit is contained in:
commit
86d2fe516e
|
@ -366,8 +366,13 @@ class Manager {
|
||||||
$result = $getShare->execute(array($hash, $this->uid));
|
$result = $getShare->execute(array($hash, $this->uid));
|
||||||
|
|
||||||
if ($result) {
|
if ($result) {
|
||||||
|
try {
|
||||||
$share = $getShare->fetch();
|
$share = $getShare->fetch();
|
||||||
$this->sendFeedbackToRemote($share['remote'], $share['share_token'], $share['remote_id'], 'decline');
|
$this->sendFeedbackToRemote($share['remote'], $share['share_token'], $share['remote_id'], 'decline');
|
||||||
|
} catch (\Exception $e) {
|
||||||
|
// if we fail to notify the remote (probably cause the remote is down)
|
||||||
|
// we still want the share to be gone to prevent undeletable remotes
|
||||||
|
}
|
||||||
}
|
}
|
||||||
$getShare->closeCursor();
|
$getShare->closeCursor();
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue