Merge pull request #3421 from nextcloud/backport/3393/stable29

[stable29] Fix labeled version autoExpire
nextcloud · Nov 13, 2024 · f08e815 · f08e815
2 parents e3f7e12 + 5c0bbc7
commit f08e815
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/lib/Versions/ExpireManager.php b/lib/Versions/ExpireManager.php
@@ -89,8 +89,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();