Merge pull request #38224 from nextcloud/versionEntityisSet

artonge · web-flow · commit 2f467d936c76 · 2023-05-15T11:26:27.000+02:00
Check if version has entity before trying to access it
diff --git a/apps/files_versions/lib/Storage.php b/apps/files_versions/lib/Storage.php
@@ -609,7 +609,7 @@ public static function expireOlderThanMaxForUser($uid) {
 			$internalPath = $version->getInternalPath();
 			\OC_Hook::emit('\OCP\Versions', 'preDelete', ['path' => $internalPath, 'trigger' => self::DELETE_TRIGGER_RETENTION_CONSTRAINT]);
 
-			$versionEntity = $versionEntities[$version->getId()];
+			$versionEntity = isset($versionEntities[$version->getId()]) ? $versionEntities[$version->getId()] : null;
 			if (!is_null($versionEntity)) {
 				$versionsMapper->delete($versionEntity);
 			}

Original file line number	Diff line number	Diff line change
`@@ -609,7 +609,7 @@ public static function expireOlderThanMaxForUser($uid) {`
`609`	`609`	`$internalPath = $version->getInternalPath();`
`610`	`610`	`\OC_Hook::emit('\OCP\Versions', 'preDelete', ['path' => $internalPath, 'trigger' => self::DELETE_TRIGGER_RETENTION_CONSTRAINT]);`
`611`	`611`
`612`		`- $versionEntity = $versionEntities[$version->getId()];`
	`612`	`+ $versionEntity = isset($versionEntities[$version->getId()]) ? $versionEntities[$version->getId()] : null;`
`613`	`613`	`if (!is_null($versionEntity)) {`
`614`	`614`	`$versionsMapper->delete($versionEntity);`
`615`	`615`	`}`