diff --git a/application/admin/controller/Addon.php b/application/admin/controller/Addon.php index d0918c43..ae5b5f83 100644 --- a/application/admin/controller/Addon.php +++ b/application/admin/controller/Addon.php @@ -230,6 +230,7 @@ class Addon extends Backend $uid = $this->request->post("uid"); $token = $this->request->post("token"); $faversion = $this->request->post("faversion"); + $force = $this->request->post("force"); if (!$uid || !$token) { throw new Exception(__('Please login and try to install')); } @@ -238,7 +239,7 @@ class Addon extends Backend 'token' => $token, 'faversion' => $faversion ]; - $info = Service::local($file, $extend); + $info = Service::local($file, $extend, $force); } catch (AddonException $e) { $this->result($e->getData(), $e->getCode(), __($e->getMessage())); } catch (Exception $e) { diff --git a/application/admin/lang/zh-cn/addon.php b/application/admin/lang/zh-cn/addon.php index f8e3fa6c..abbcb254 100755 --- a/application/admin/lang/zh-cn/addon.php +++ b/application/admin/lang/zh-cn/addon.php @@ -33,6 +33,7 @@ return [ 'Store not available tips' => '插件市场暂不可用,是否切换到本地插件?', 'Switch to the local' => '切换到本地插件', 'try to reload' => '重新尝试加载', + 'Please disable addon first' => '请先禁用插件再进行操作', 'Please disable the add before trying to upgrade' => '请先禁用插件再进行升级', 'Please disable the add before trying to uninstall' => '请先禁用插件再进行卸载', 'Login now' => '立即登录', diff --git a/application/admin/view/addon/index.html b/application/admin/view/addon/index.html index 1c7f7262..e72defaf 100644 --- a/application/admin/view/addon/index.html +++ b/application/admin/view/addon/index.html @@ -167,6 +167,11 @@ +