diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2018-01-20 11:42:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-20 11:42:48 +0100 |
| commit | c450dba1a080bff63e2d3742b11872c82de477ff (patch) | |
| tree | 1d1740e1ad8de578e671127e22054e63abaf16b1 /lib | |
| parent | 4d99faae4f816fe49c921eb1e704286d0ca422c2 (diff) | |
| parent | 80a36380fc77c2c9965b526d6f286ff7167812c6 (diff) | |
| download | nextcloud-server-c450dba1a080bff63e2d3742b11872c82de477ff.tar.gz nextcloud-server-c450dba1a080bff63e2d3742b11872c82de477ff.zip | |
Merge pull request #7956 from nextcloud/remove-vendor-detection
Remove vendor detection
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Updater.php | 12 |
1 files changed, 2 insertions, 10 deletions
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') { |