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

Merge pull request #21200 from nextcloud/backport/21181/stable19 

[stable19] Do not only catch Exceptions but any Throwable during rmt share delete
This commit is contained in:
Roeland Jago Douma 2020-06-04 10:59:47 +02:00 committed by GitHub
parent f431c145bc 25dd585251
commit c296a55fe8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -520,7 +520,7 @@ class Manager {
if ($result && $share !== false && (int)$share['share_type'] === Share::SHARE_TYPE_USER) { if ($result && $share !== false && (int)$share['share_type'] === Share::SHARE_TYPE_USER) {
try { try {
$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) { } catch (\Throwable $e) {
// if we fail to notify the remote (probably cause the remote is down) // 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 // 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` $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 (?))'; WHERE (`user` = ? OR `user` IN (?))';
$parameters = [$this->uid, implode(',',$userGroups)]; $parameters = [$this->uid, implode(',',$userGroups)];
if (!is_null($accepted)) { if (!is_null($accepted)) {