From 192700b3179328e25236f92e10f3c7e7dfd66be3 Mon Sep 17 00:00:00 2001 From: tanghucheng Date: Wed, 23 Aug 2023 17:37:15 +0800 Subject: [PATCH] * Fix bug for ipd upgrade. --- module/upgrade/control.php | 1 + module/upgrade/model.php | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/module/upgrade/control.php b/module/upgrade/control.php index b600a0f7d4..93f02f0428 100644 --- a/module/upgrade/control.php +++ b/module/upgrade/control.php @@ -218,6 +218,7 @@ class upgrade extends control $this->loadModel('setting')->setItem('system.custom.URAndSR', '1'); $this->loadModel('setting')->setItem('system.common.closedFeatures', ''); $this->loadModel('setting')->setItem('system.common.disabledFeatures', ''); + $this->upgrade->addORPriv(); } if($selectMode) diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 63b28c9629..81071bdca1 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -692,7 +692,6 @@ class upgradeModel extends model if($ipdinstall) $this->execSQL($this->getUpgradeFile('ipdinstall')); if($fromVersion == 'ipd1.0.beta1') $this->execSQL($this->getUpgradeFile('ipd1.0.beta1')); - if($this->config->edition == 'ipd' and strpos($fromVersion, 'ipd') === false) $this->addORPriv(); $this->loadModel('product')->refreshStats(true); $this->loadModel('program')->refreshStats(true);