diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2021-03-30 20:52:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-30 20:52:17 +0200 |
| commit | 06ae9c3dc7dd14717ada7af7053405cf08c7dc9a (patch) | |
| tree | ba711a53b5135dee7f734ebea9c7b37182e42a22 | |
| parent | 071a38a22f415a6f0025c8e4e9d379d2513d8824 (diff) | |
| parent | be3ae9a44b29187beae996130c1d7f6b3d3207d0 (diff) | |
| download | nextcloud-server-06ae9c3dc7dd14717ada7af7053405cf08c7dc9a.tar.gz nextcloud-server-06ae9c3dc7dd14717ada7af7053405cf08c7dc9a.zip | |
Merge pull request #26372 from nextcloud/fix/noid/calm-down-recipient-not-in-grp
gracefully handle deleteFromSelf when share is already gone
| -rw-r--r-- | lib/private/Share20/DefaultShareProvider.php | 3 | ||||
| -rw-r--r-- | tests/lib/Share20/DefaultShareProviderTest.php | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/lib/private/Share20/DefaultShareProvider.php b/lib/private/Share20/DefaultShareProvider.php index cf05e9bfbc3..00ef7e2426b 100644 --- a/lib/private/Share20/DefaultShareProvider.php +++ b/lib/private/Share20/DefaultShareProvider.php @@ -470,7 +470,8 @@ class DefaultShareProvider implements IShareProvider { } if (!$group->inGroup($user)) { - throw new ProviderException('Recipient not in receiving group'); + // nothing left to do + return; } // Try to fetch user specific share diff --git a/tests/lib/Share20/DefaultShareProviderTest.php b/tests/lib/Share20/DefaultShareProviderTest.php index f6ce4894dbb..40626bdb571 100644 --- a/tests/lib/Share20/DefaultShareProviderTest.php +++ b/tests/lib/Share20/DefaultShareProviderTest.php @@ -1558,9 +1558,6 @@ class DefaultShareProviderTest extends \Test\TestCase { public function testDeleteFromSelfGroupUserNotInGroup() { - $this->expectException(\OC\Share20\Exception\ProviderException::class); - $this->expectExceptionMessage('Recipient not in receiving group'); - $qb = $this->dbConn->getQueryBuilder(); $stmt = $qb->insert('share') ->values([ |