Skip to content

[stable25] Prevent throwing an error in node deletion hook #1493

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
szaimen merged 1 commit into from
Nov 24, 2022
Merged

[stable25] Prevent throwing an error in node deletion hook #1493

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions lib/Listener/CacheEntryRemovedListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,16 @@ public function handle(Event $event): void {
return;
}

// Remove node from all albums containing it.
$albums = $this->albumMapper->getForFile($event->getFileId());
foreach ($albums as $album) {
$this->albumMapper->removeFile($album->getId(), $event->getFileId());
try {
// Remove node from all albums containing it.
$albums = $this->albumMapper->getForFile($event->getFileId());

foreach ($albums as $album) {
$this->albumMapper->removeFile($album->getId(), $event->getFileId());
}
} catch(\Throwable $ex) {
// If an error occur, return silently as we don't want to block the rest of the deletion process.
// It happened already during migrations when the albums table is not yet created, but a folder is deleted by the theming app.
}
}
}