From 394e263c87500fbd9bd3cb03e529e0ef35022727 Mon Sep 17 00:00:00 2001 From: sgm0422 <976204163@qq.com> Date: Fri, 3 Jul 2020 13:45:04 +0800 Subject: [PATCH] * Fix upgrade method. --- module/upgrade/control.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/upgrade/control.php b/module/upgrade/control.php index fd4f82041b..04e5e83825 100644 --- a/module/upgrade/control.php +++ b/module/upgrade/control.php @@ -141,7 +141,7 @@ class upgrade extends control if(!$this->upgrade->isError()) { - if(version_compare(str_replace('_', '.', $fromVersion), '15', '<')) $this->locate(inlink('mergeProgram')); + if(version_compare(str_replace('_', '.', $fromVersion), '15', '<') && !isset($this->config->qcVersion)) $this->locate(inlink('mergeProgram')); $this->locate(inlink('afterExec', "fromVersion=$fromVersion")); }