From bc8e061128d8a8f423fc500f5fa5c3e733dbcf9b Mon Sep 17 00:00:00 2001 From: sgm0422 <976204163@qq.com> Date: Thu, 10 Mar 2022 10:20:45 +0800 Subject: [PATCH] * Fix upgrade error. --- module/upgrade/model.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/module/upgrade/model.php b/module/upgrade/model.php index beb6dddc05..e8c032a130 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -34,10 +34,9 @@ class upgradeModel extends model * @access public * @return array */ - public function getVersionsToUpdate($openVersion) + public function getVersionsToUpdate($openVersion, $fromEdition) { $versions = array(); - $edition = $this->config->edition; /* Always update open. */ foreach($this->lang->upgrade->fromVersions as $version => $versionName) @@ -46,21 +45,21 @@ class upgradeModel extends model if(version_compare(str_replace('_', '.', $version), str_replace('_', '.', $openVersion)) < 0) continue; $versions[$version] = array('pro' => array(), 'biz' => array(), 'max' => array()); } - if($edition == 'open') return $versions; + if($fromEdition == 'open') return $versions; /* Update to pro|biz|max. */ foreach($this->config->upgrade->proVersion as $pro => $open) { if(isset($versions[$open])) $versions[$open]['pro'][] = $pro; } - if($edition == 'pro') return $versions; + if($fromEdition == 'pro') return $versions; /* Update to biz|max. */ foreach($this->config->upgrade->bizVersion as $biz => $open) { if(isset($versions[$open])) $versions[$open]['biz'][] = $biz; } - if($edition != 'max') return $versions; + if($fromEdition == 'biz') return $versions; /* Update to max. */ foreach($this->config->upgrade->maxVersion as $max => $open) @@ -90,7 +89,7 @@ class upgradeModel extends model /* Execute. */ $fromOpenVersion = is_numeric($fromVersion[0]) ? $fromVersion : $this->config->upgrade->{$fromEdition . 'Version'}[$fromVersion]; - $versions = $this->getVersionsToUpdate($fromOpenVersion); + $versions = $this->getVersionsToUpdate($fromOpenVersion, $fromEdition); foreach($versions as $openVersion => $chargedVersions) { $executeXuanxuan = false;