From 5cae6e943c600759d14b36967e15346f76af5248 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B9=BF=E6=98=8E?= Date: Mon, 7 Mar 2022 08:54:42 +0800 Subject: [PATCH] * Finish task #50323. --- framework/control.class.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/framework/control.class.php b/framework/control.class.php index 59ba3f5086..76f24e658e 100644 --- a/framework/control.class.php +++ b/framework/control.class.php @@ -137,12 +137,22 @@ class control extends baseControl { $installedVersion = $this->loadModel('setting')->getVersion(); + /* Means open source upgrade to biz or max. */ + if(is_numeric($installedVersion[0]) and $this->config->edition != 'open') + { + $this->loadModel('setting')->setItem('system.common.global.version', $this->config->version); + $this->loadModel('effort')->convertEstToEffort(); + $this->loadModel('upgrade')->importBuildinModules(); + $this->upgrade->addSubStatus(); + } + + /* Max only has new system mode. */ if($installedVersion[0] != 'm' and $this->config->edition == 'max') { + $this->loadModel('setting')->setItem('system.common.global.version', $this->config->version); if($this->config->systemMode == 'classic' and $this->app->getModuleName() != 'upgrade') { $this->loadModel('setting')->setItem('system.common.global.mode', 'new'); - $this->loadModel('setting')->setItem('system.common.global.version', $this->config->version); $this->locate(helper::createLink('upgrade', 'mergeTips')); } }