Skip to content

Commit c296a55

Browse files
authored
Merge pull request #21200 from nextcloud/backport/21181/stable19
[stable19] Do not only catch Exceptions but any Throwable during rmt share delete
2 parents f431c14 + 25dd585 commit c296a55

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

apps/files_sharing/lib/External/Manager.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,7 @@ public function removeShare($mountPoint) {
520520
if ($result && $share !== false && (int)$share['share_type'] === Share::SHARE_TYPE_USER) {
521521
try {
522522
$this->sendFeedbackToRemote($share['remote'], $share['share_token'], $share['remote_id'], 'decline');
523-
} catch (\Exception $e) {
523+
} catch (\Throwable $e) {
524524
// if we fail to notify the remote (probably cause the remote is down)
525525
// we still want the share to be gone to prevent undeletable remotes
526526
}
@@ -630,7 +630,7 @@ private function getShares($accepted) {
630630
}
631631

632632
$query = 'SELECT `id`, `remote`, `remote_id`, `share_token`, `name`, `owner`, `user`, `mountpoint`, `accepted`
633-
FROM `*PREFIX*share_external`
633+
FROM `*PREFIX*share_external`
634634
WHERE (`user` = ? OR `user` IN (?))';
635635
$parameters = [$this->uid, implode(',',$userGroups)];
636636
if (!is_null($accepted)) {

0 commit comments

Comments
 (0)