Skip to content

Commit

Permalink
Merge pull request #26382 from nextcloud/backport/26372/stable21
Browse files Browse the repository at this point in the history
[stable21] gracefully handle deleteFromSelf when share is already gone
  • Loading branch information
ChristophWurst authored Mar 31, 2021
2 parents 6d70bd9 + caec3a8 commit 3e5fbd4
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
3 changes: 2 additions & 1 deletion lib/private/Share20/DefaultShareProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,8 @@ public function deleteFromSelf(IShare $share, $recipient) {
}

if (!$group->inGroup($user)) {
throw new ProviderException('Recipient not in receiving group');
// nothing left to do
return;
}

// Try to fetch user specific share
Expand Down
3 changes: 0 additions & 3 deletions tests/lib/Share20/DefaultShareProviderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -1558,9 +1558,6 @@ public function testDeleteFromSelfGroupAlreadyCustomShare() {


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([
Expand Down

0 comments on commit 3e5fbd4

Please sign in to comment.