]> source.dussan.org Git - nextcloud-server.git/commitdiff
Allow major/minor match for owncloud version
authorJulius Härtl <jus@bitgrid.net>
Fri, 25 Sep 2020 10:04:11 +0000 (12:04 +0200)
committerJulius Härtl <jus@bitgrid.net>
Mon, 14 Dec 2020 10:12:50 +0000 (11:12 +0100)
Signed-off-by: Julius Härtl <jus@bitgrid.net>
lib/private/Updater.php

index 4b5d02aeb64da8e1e31f7cd3c8d76daa5d7617d9..2b5dce78057e052316918c56534a784926d2bb30 100644 (file)
@@ -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';
                }