Skip to content

[stable29] fix(files_versions): avoid unintentional skipping of expiration #46740

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
skjnldsv merged 1 commit into from
Jul 27, 2024
Merged

[stable29] fix(files_versions): avoid unintentional skipping of expiration #46740

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
fix(files_versions): avoid unintentional skipping of expiration 
Signed-off-by: carhe <[email protected]>
  • Loading branch information
@carhe @backportbot
carhe authored and backportbot[bot] committed Jul 25, 2024
commit 7d843f8b644bf3af800893073ce04b16d7e243ae
2 changes: 1 addition & 1 deletion apps/files_versions/lib/Storage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -929,7 +929,7 @@ public static function expire($filename, $uid) {
$pathparts = pathinfo($path);
$timestamp = (int)substr($pathparts['extension'] ?? '', 1);
$versionEntity = $versionsMapper->findVersionForFileId($file->getId(), $timestamp);
if ($versionEntity->getMetadataValue('label') !== '') {
if ($versionEntity->getMetadataValue('label') !== null && $versionEntity->getMetadataValue('label') !== '') {
continue;
}
$versionsMapper->delete($versionEntity);
Expand Down