From 80a36380fc77c2c9965b526d6f286ff7167812c6 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Fri, 19 Jan 2018 14:10:29 +0100 Subject: Disable vendor detection when upgrading from 11.0.x Upgrade from 11 to 14 is not supported anyways. Signed-off-by: Morris Jobke --- lib/private/Updater.php | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'lib/private') diff --git a/lib/private/Updater.php b/lib/private/Updater.php index 1c79e2ad440..43096e7c1f8 100644 --- a/lib/private/Updater.php +++ b/lib/private/Updater.php @@ -182,16 +182,8 @@ 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 === '') { - if (in_array($oldVersion, [ - '11.0.2.7', - '11.0.1.2', - '11.0.0.10', - ], true)) { - $currentVendor = 'nextcloud'; - } else if (isset($allowedPreviousVersions['owncloud'][$oldVersion])) { - $currentVendor = 'owncloud'; - } + if ($currentVendor === '' && isset($allowedPreviousVersions['owncloud'][$oldVersion])) { + $currentVendor = 'owncloud'; } if ($currentVendor === 'nextcloud') { -- cgit v1.2.3