Skip to content

Commit f3c095b

Browse files
authored
Merge pull request #1823 from nextcloud/pulsejet/fix-link-del
fix: properly handle public link share deletion
2 parents a88446c + ed48a3f commit f3c095b

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

lib/Listener/AlbumsManagementEventListener.php

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,13 @@ public function handle(Event $event): void {
4949
}
5050
} elseif ($event instanceof ShareDeletedEvent) {
5151
$receiverId = $event->getShare()->getSharedWith();
52-
$this->forEachSubNode(
53-
$event->getShare()->getNode(),
54-
// Remove node from any album when the owner is $receiverId.
55-
fn ($node) => $this->albumMapper->removeFileWithOwner($node->getId(), $receiverId),
56-
);
52+
if ($receiverId !== null) { // null for public link shares
53+
$this->forEachSubNode(
54+
$event->getShare()->getNode(),
55+
// Remove node from any album when the owner is $receiverId.
56+
fn ($node) => $this->albumMapper->removeFileWithOwner($node->getId(), $receiverId),
57+
);
58+
}
5759
} elseif ($event instanceof UserRemovedEvent) {
5860
// Get all shared albums for this group:
5961
$albums_group = $this->albumMapper->getSharedAlbumsForCollaborator($event->getGroup()->getGID(), AlbumMapper::TYPE_GROUP);

0 commit comments

Comments
 (0)