Allow migrating from ownCloud 10.0.0
Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
parent
2259140e3b
commit
dd6c9cb03d
|
@ -190,6 +190,16 @@ class Updater extends BasicEmitter {
|
||||||
$majorMinor = $version[0] . '.' . $version[1];
|
$majorMinor = $version[0] . '.' . $version[1];
|
||||||
|
|
||||||
$currentVendor = $this->config->getAppValue('core', 'vendor', '');
|
$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, [
|
||||||
|
'10.0.0.12',
|
||||||
|
], true)) {
|
||||||
|
$currentVendor = 'owncloud';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if ($currentVendor === 'nextcloud') {
|
if ($currentVendor === 'nextcloud') {
|
||||||
return isset($allowedPreviousVersions[$currentVendor][$majorMinor])
|
return isset($allowedPreviousVersions[$currentVendor][$majorMinor])
|
||||||
&& (version_compare($oldVersion, $newVersion, '<=') ||
|
&& (version_compare($oldVersion, $newVersion, '<=') ||
|
||||||
|
@ -197,7 +207,8 @@ class Updater extends BasicEmitter {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check if the instance can be migrated
|
// Check if the instance can be migrated
|
||||||
return isset($allowedPreviousVersions[$currentVendor][$majorMinor]);
|
return isset($allowedPreviousVersions[$currentVendor][$majorMinor]) ||
|
||||||
|
isset($allowedPreviousVersions[$currentVendor][$oldVersion]);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -37,6 +37,7 @@ $OC_VersionCanBeUpgradedFrom = [
|
||||||
'12.0' => true,
|
'12.0' => true,
|
||||||
],
|
],
|
||||||
'owncloud' => [
|
'owncloud' => [
|
||||||
|
'10.0.0.12' => true,
|
||||||
],
|
],
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue