diff options
| author | Joas Schilling <coding@schilljs.com> | 2017-11-22 16:02:22 +0300 |
|---|---|---|
| committer | Joas Schilling <coding@schilljs.com> | 2017-11-22 16:06:07 +0300 |
| commit | 2c11d62adfbe059724cdb1c6c9754ef4edb515e1 (patch) | |
| tree | a2741880c29aebab54e34a1c6008c9c1a5db86e7 /lib/private | |
| parent | 44d6fe99efc28fc56b4f18b95b2297283798bd50 (diff) | |
Allow migration from upcoming 10.0.4 ownCloud release
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/Updater.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/private/Updater.php b/lib/private/Updater.php index f80b3a863a5..be45e9a1301 100644 --- a/lib/private/Updater.php +++ b/lib/private/Updater.php @@ -188,6 +188,7 @@ class Updater extends BasicEmitter { public function isUpgradePossible($oldVersion, $newVersion, array $allowedPreviousVersions) { $version = explode('.', $oldVersion); $majorMinor = $version[0] . '.' . $version[1]; + $patch = $version[0] . '.' . $version[1] . '.' . $version[2]; $currentVendor = $this->config->getAppValue('core', 'vendor', ''); @@ -199,7 +200,8 @@ class Updater extends BasicEmitter { '11.0.0.10', ], true)) { $currentVendor = 'nextcloud'; - } else if (isset($allowedPreviousVersions['owncloud'][$oldVersion])) { + } else if (isset($allowedPreviousVersions['owncloud'][$oldVersion]) + || isset($allowedPreviousVersions['owncloud'][$patch])) { $currentVendor = 'owncloud'; } } @@ -212,7 +214,8 @@ class Updater extends BasicEmitter { // Check if the instance can be migrated return isset($allowedPreviousVersions[$currentVendor][$majorMinor]) || - isset($allowedPreviousVersions[$currentVendor][$oldVersion]); + isset($allowedPreviousVersions[$currentVendor][$oldVersion]) || + isset($allowedPreviousVersions[$currentVendor][$patch]); } /** |