diff --git a/module/install/view/step4.html.php b/module/install/view/step4.html.php index e0f8f30c8a..7a87903345 100644 --- a/module/install/view/step4.html.php +++ b/module/install/view/step4.html.php @@ -41,7 +41,7 @@ lang->upgrade->to18Mode['new'];?> - + lang->upgrade->mode;?> lang->upgrade->leanUsage;?> @@ -106,7 +106,7 @@ lang->upgrade->remark;?> lang->upgrade->remarkDesc;?> - + diff --git a/module/program/model.php b/module/program/model.php index 05903b363a..d137142e00 100644 --- a/module/program/model.php +++ b/module/program/model.php @@ -1609,8 +1609,8 @@ class programModel extends model $program->status = 'doing'; $program->grade = 1; $program->auth = 'extend'; - $program->openedDate = $minBegin; - $program->begin = helper::today(); + $program->openedDate = helper::today(); + $program->begin = $minBegin; $program->end = LONG_TIME; $this->dao->insert(TABLE_PROGRAM)->data($program)->exec(); diff --git a/module/upgrade/control.php b/module/upgrade/control.php index 840e206f3a..69f0b567c5 100644 --- a/module/upgrade/control.php +++ b/module/upgrade/control.php @@ -272,9 +272,7 @@ class upgrade extends control if($mode == 'new') $this->locate(inlink('mergeTips')); } - $title = $this->lang->upgrade->selectMode; - - $this->view->title = $title; + $this->view->title = $this->lang->upgrade->selectMode; $this->display(); } diff --git a/module/upgrade/view/to18guide.html.php b/module/upgrade/view/to18guide.html.php index ed43c32e98..f8500fe639 100644 --- a/module/upgrade/view/to18guide.html.php +++ b/module/upgrade/view/to18guide.html.php @@ -20,9 +20,9 @@ - - - + + +
lang->upgrade->mode;?>lang->upgrade->to18Mode['lean'];?>lang->upgrade->to18Mode['new'];?>lang->upgrade->mode;?>lang->upgrade->to18Mode['lean'];?>lang->upgrade->to18Mode['new'];?>