fix: set mimetype_version during upgrade to the old version

Signed-off-by: Robin Appelman <robin@icewind.nl>

2 files changed, 8 insertions, 6 deletions

diff --git a/lib/private/Repair/RepairMimeTypes.php b/lib/private/Repair/RepairMimeTypes.php
index fc22a029698..2d9072b999b 100644
--- a/lib/private/Repair/RepairMimeTypes.php
+++ b/lib/private/Repair/RepairMimeTypes.php
@@ -257,13 +257,11 @@ class RepairMimeTypes implements IRepairStep {
 	}
 
 	private function getMimeTypeVersion(): string {
-		$serverVersion = $this->config->getSystemValueString('version', '0.0.0');
-		// 29.0.0.10 is the last version with a mimetype migration before it was moved to a separate version number
-		if (version_compare($serverVersion, '29.0.0.10', '>')) {
-			return $this->config->getAppValue('files', 'mimetype_version', '29.0.0.10');
-		} else {
-			return $serverVersion;
+		$mimeVersion = $this->config->getAppValue('files', 'mimetype_version', '');
+		if ($mimeVersion) {
+			return $mimeVersion;
 		}
+		return $this->config->getSystemValueString('version', '0.0.0');
 	}
 
 	/**
diff --git a/lib/private/Updater.php b/lib/private/Updater.php
index 018e4797232..2f5444417fb 100644
--- a/lib/private/Updater.php
+++ b/lib/private/Updater.php
@@ -133,6 +133,10 @@ class Updater extends BasicEmitter {
 		$installedVersion = $this->config->getSystemValueString('version', '0.0.0');
 		$currentVersion = implode('.', \OCP\Util::getVersion());
 
+		if ($this->config->getAppValue('files', 'mimetype_version', '') === '') {
+			$this->config->setAppValue('files', 'mimetype_version', $installedVersion);
+		}
+
 		$this->log->debug('starting upgrade from ' . $installedVersion . ' to ' . $currentVersion, ['app' => 'core']);
 
 		$success = true;