diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2020-06-04 10:59:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-04 10:59:26 +0200 |
| commit | 857b09e068e003a7e5c52e6f5c686cb7eb50e09f (patch) | |
| tree | 64300ec5b765e87f662619da91e43916bdaafe5d | |
| parent | 52cc0c7bb41deaa81968d80e3385b4f7479c1b78 (diff) | |
| parent | fab0888fb294da79c86105952600d31e3e005698 (diff) | |
| download | nextcloud-server-857b09e068e003a7e5c52e6f5c686cb7eb50e09f.tar.gz nextcloud-server-857b09e068e003a7e5c52e6f5c686cb7eb50e09f.zip | |
Merge pull request #21201 from nextcloud/backport/21181/stable18
[stable18] Do not only catch Exceptions but any Throwable during rmt share delete
| -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 c58e6e7b98a..14c1eaa33c2 100644 --- a/apps/files_sharing/lib/External/Manager.php +++ b/apps/files_sharing/lib/External/Manager.php @@ -526,7 +526,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 } @@ -636,7 +636,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)) { |