Merge pull request #3422 from nextcloud/backport/3393/stable30

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