mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5754 from nextcloud/fed-unshare-fail-remote-12 

[12] still remove the federated share even if we cant notify the remote
This commit is contained in:
Roeland Jago Douma 2017-07-21 12:46:31 +02:00 committed by GitHub
parent 4165d5bca6 e49b8959c4
commit 73b293fa6a
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/files_sharing/lib/External/Manager.php vendored
View File

@ -366,8 +366,13 @@ class Manager {
$result = $getShare->execute(array($hash, $this->uid));
if ($result) {
$share = $getShare->fetch();
$this->sendFeedbackToRemote($share['remote'], $share['share_token'], $share['remote_id'], 'decline');
try {
$share = $getShare->fetch();
$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();