diff options
| author | Christoph Wurst <ChristophWurst@users.noreply.github.com> | 2020-06-03 11:11:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-03 11:11:47 +0200 |
| commit | 111c8c9e0e229777d984800fe7e6c58dd15dc1f4 (patch) | |
| tree | e5f2b604b8fcabceb1b2cfc8ab3cef7af3a4b322 /apps/files_sharing | |
| parent | f62f23ed1d9864983f24f5c4f9fc00d3e2a8663d (diff) | |
| parent | 09a632242d9ee9a3403580a5818fc0e2ce0afa72 (diff) | |
| download | nextcloud-server-111c8c9e0e229777d984800fe7e6c58dd15dc1f4.tar.gz nextcloud-server-111c8c9e0e229777d984800fe7e6c58dd15dc1f4.zip | |
Merge pull request #21181 from nextcloud/fix/remote-share-remove-error-handling
Do not only catch Exceptions but any Throwable during rmt share delete
Diffstat (limited to 'apps/files_sharing')
| -rw-r--r-- | apps/files_sharing/lib/External/Manager.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/files_sharing/lib/External/Manager.php b/apps/files_sharing/lib/External/Manager.php index 8331787c6df..e7ddf6c3a74 100644 --- a/apps/files_sharing/lib/External/Manager.php +++ b/apps/files_sharing/lib/External/Manager.php @@ -520,7 +520,7 @@ class Manager { if ($result && $share !== false && (int)$share['share_type'] === Share::SHARE_TYPE_USER) { try { $this->sendFeedbackToRemote($share['remote'], $share['share_token'], $share['remote_id'], 'decline'); - } catch (\Exception $e) { + } catch (\Throwable $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 } @@ -630,7 +630,7 @@ class Manager { } $query = 'SELECT `id`, `remote`, `remote_id`, `share_token`, `name`, `owner`, `user`, `mountpoint`, `accepted` - FROM `*PREFIX*share_external` + FROM `*PREFIX*share_external` WHERE (`user` = ? OR `user` IN (?))'; $parameters = [$this->uid, implode(',',$userGroups)]; if (!is_null($accepted)) { |