From: Julius Härtl <jus@bitgrid.net>
Date: Fri, 25 Sep 2020 10:04:11 +0000 (+0200)
Subject: Allow major/minor match for owncloud version
X-Git-Tag: v20.0.4~1^2~17
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ab40a7c585c5dafaf5ec01b2ef81bfd382d8b574;p=nextcloud-server.git

Allow major/minor match for owncloud version

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---

diff --git a/lib/private/Updater.php b/lib/private/Updater.php
index 4b5d02aeb64..2b5dce78057 100644
--- a/lib/private/Updater.php
+++ b/lib/private/Updater.php
@@ -192,7 +192,10 @@ class Updater extends BasicEmitter {
 		$currentVendor = $this->config->getAppValue('core', 'vendor', '');
 
 		// Vendor was not set correctly on install, so we have to white-list known versions
-		if ($currentVendor === '' && isset($allowedPreviousVersions['owncloud'][$oldVersion])) {
+		if ($currentVendor === '' && (
+			isset($allowedPreviousVersions['owncloud'][$oldVersion]) ||
+			isset($allowedPreviousVersions['owncloud'][$majorMinor])
+		)) {
 			$currentVendor = 'owncloud';
 		}