sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7956 from nextcloud/remove-vendor-detection 

Remove vendor detection
pull/7975/head
Roeland Jago Douma 2018-01-20 11:42:48 +07:00 committed by GitHub
parent 4d99faae4f 80a36380fc
commit c450dba1a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/private/Updater.php
Unescape Escape View File

@ -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') {