Skip to content

Check if version entity is not null before delete #38125

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
skjnldsv merged 1 commit into from
May 9, 2023
Merged

Check if version entity is not null before delete #38125

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
Check if version entity is not null before delete 
Signed-off-by: Git'Fellow <[email protected]>
  • Loading branch information
@solracsf
solracsf authored May 8, 2023
commit 7cd5cbe6e9e7d79039f89034b90a13c3aa0b9278
7 changes: 6 additions & 1 deletion apps/files_versions/lib/Storage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,7 +608,12 @@ public static function expireOlderThanMaxForUser($uid) {
foreach ($versions as $version) {
$internalPath = $version->getInternalPath();
\OC_Hook::emit('\OCP\Versions', 'preDelete', ['path' => $internalPath, 'trigger' => self::DELETE_TRIGGER_RETENTION_CONSTRAINT]);
$versionsMapper->delete($versionEntities[$version->getId()]);

$versionEntity = $versionEntities[$version->getId()];
if (!is_null($versionEntity)) {
$versionsMapper->delete($versionEntity);
}

$version->delete();
\OC_Hook::emit('\OCP\Versions', 'delete', ['path' => $internalPath, 'trigger' => self::DELETE_TRIGGER_RETENTION_CONSTRAINT]);
}
Expand Down