Merge pull request #3393 from XueSheng-GIT/fix-labeled-version-expiry

Fix labeled version autoExpire
nextcloud · Nov 13, 2024 · d49859f · d49859f
2 parents 939b6fd + 082d6d0
commit d49859f
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/lib/Versions/ExpireManager.php b/lib/Versions/ExpireManager.php
@@ -66,8 +66,11 @@ protected function getAutoExpireList(int $time, array $versions): array {
 			while ($newInterval) {
 				if ($nextInterval === -1 || $prevTimestamp > $nextInterval) {
 					if ($version->getTimestamp() > $nextVersion) {
-						//distance between two version too small, mark to delete
-						$toDelete[] = $version;
+						// Do not expire versions with a label.
+						if (!($version instanceof IMetadataVersion) || $version->getMetadataValue('label') === null || $version->getMetadataValue('label') === '') {
+							//distance between two version too small, mark to delete
+							$toDelete[] = $version;
+						}
 					} else {
 						$nextVersion = $version->getTimestamp() - $step;
 						$prevTimestamp = $version->getTimestamp();