From ecf718ee9b26f9230e17bcbe243df1c762a6ac5e Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Mon, 12 Jul 2021 13:16:11 +0800 Subject: [PATCH] * Finish task #40015. --- module/custom/control.php | 11 ++++++----- module/custom/view/mode.html.php | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/module/custom/control.php b/module/custom/control.php index 3547880f71..22f29cbd22 100644 --- a/module/custom/control.php +++ b/module/custom/control.php @@ -545,11 +545,11 @@ class custom extends control { $mode = fixer::input('post')->get('mode'); $this->loadModel('setting')->setItem('system.common.global.mode', $mode); + $this->loadModel('setting')->setItem('system.common.global.changedMode', 'yes'); if($mode == 'new') die(js::locate($this->createLink('upgrade', 'mergeTips'), 'parent')); if($mode == 'classic') die(js::reload('top')); } - if($mode == 'new') { if(isset($this->config->global->upgradeStep) and $this->config->global->upgradeStep == 'mergeProgram') die(js::locate($this->createLink('upgrade', 'mergeProgram'), 'parent')); @@ -560,10 +560,11 @@ class custom extends control $this->app->loadLang('upgrade'); - $this->view->mode = $mode; - $this->view->title = $this->lang->custom->mode; - $this->view->position[] = $this->lang->custom->common; - $this->view->position[] = $this->view->title; + $this->view->title = $this->lang->custom->mode; + $this->view->position[] = $this->lang->custom->common; + $this->view->position[] = $this->view->title; + $this->view->mode = $mode; + $this->view->changedMode = zget($this->config->global, 'changedMode', 'no'); $this->display(); } diff --git a/module/custom/view/mode.html.php b/module/custom/view/mode.html.php index c8d917e511..cacbec6ba3 100644 --- a/module/custom/view/mode.html.php +++ b/module/custom/view/mode.html.php @@ -31,7 +31,7 @@