upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-03-24 19:33:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge pull request #38125 from nextcloud/versionEntityCheck

Browse source
This commit is contained in:
John Molakvoæ 2023-05-09 17:11:57 +02:00 committed by GitHub
commit 416f632280
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/files_versions/lib/Storage.php
View file

@ -608,7 +608,12 @@ class Storage {
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]);
}