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

Merge pull request #26381 from nextcloud/backport/26372/stable20 

[stable20] gracefully handle deleteFromSelf when share is already gone
This commit is contained in:
Christoph Wurst 2021-03-31 07:43:11 +02:00 committed by GitHub
parent 35db1b5996 47abd1f37e
commit 7c4fca57a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/private/Share20/DefaultShareProvider.php
View File

@ -469,7 +469,8 @@ class DefaultShareProvider implements IShareProvider {
} }
if (!$group->inGroup($user)) { if (!$group->inGroup($user)) {
throw new ProviderException('Recipient not in receiving group'); // nothing left to do
return;
} }
// Try to fetch user specific share // Try to fetch user specific share

3
tests/lib/Share20/DefaultShareProviderTest.php
View File

@ -1558,9 +1558,6 @@ class DefaultShareProviderTest extends \Test\TestCase {
public function testDeleteFromSelfGroupUserNotInGroup() { public function testDeleteFromSelfGroupUserNotInGroup() {
$this->expectException(\OC\Share20\Exception\ProviderException::class);
$this->expectExceptionMessage('Recipient not in receiving group');
$qb = $this->dbConn->getQueryBuilder(); $qb = $this->dbConn->getQueryBuilder();
$stmt = $qb->insert('share') $stmt = $qb->insert('share')
->values([ ->values([