From cab9785e00c0bfc4c20081df2f5158f18cf436bf Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Mon, 19 Apr 2021 11:25:18 +0800 Subject: [PATCH] * Fix upgrade logic. --- module/upgrade/control.php | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/module/upgrade/control.php b/module/upgrade/control.php index 5169770ffb..52b0fc460b 100644 --- a/module/upgrade/control.php +++ b/module/upgrade/control.php @@ -23,10 +23,7 @@ class upgrade extends control $upgradeFile = $this->app->wwwRoot . 'upgrade.php'; if(!file_exists($upgradeFile)) $this->locate($this->createLink('my', 'index')); - if((version_compare($this->config->installedVersion, '15', '<') - || strpos($this->config->installedVersion, 'biz') !== false - || strpos($this->config->installedVersion, 'pro') !== false) - && strpos($this->config->installedVersion, 'max') === false) + if(!isset($this->config->systemMode) || !isset($this->config->qcVersion)) { /* Judge upgrade step. */ $upgradeStep = $this->loadModel('setting')->getItem('owner=system&module=common§ion=global&key=upgradeStep'); @@ -137,11 +134,7 @@ class upgrade extends control if(!$this->upgrade->isError()) { - if((version_compare($fromVersion, '15', '<') - || strpos($fromVersion, 'biz') !== false - || strpos($fromVersion, 'pro') !== false) - && strpos($fromVersion, 'max') === false - && !isset($this->config->qcVersion)) $this->locate(inlink('to15Guide', "fromVersion=$fromVersion")); + if(!isset($this->config->systemMode) && !isset($this->config->qcVersion)) $this->locate(inlink('to15Guide', "fromVersion=$fromVersion")); $this->locate(inlink('afterExec', "fromVersion=$fromVersion")); }