From 08c42cf246dd5da998dcd89a652232e917ddbedf Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Fri, 19 Mar 2021 10:04:40 +0800 Subject: [PATCH] * Fix code. --- module/common/model.php | 2 +- module/personnel/control.php | 2 +- module/program/model.php | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/module/common/model.php b/module/common/model.php index 04917e4964..b6c1212ec3 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -698,7 +698,7 @@ class commonModel extends model if($currentModule == 'product' and $currentMethod == 'browse') $active = ''; if($currentModule == 'story') $active = ''; - $misc = $openApp != $lang->navGroup->$module ? "data-app='$openApp'" : ''; + $misc = isset($lang->navGroup->$module) and $openApp != $lang->navGroup->$module ? "data-app='$openApp'" : ''; $menuItemHtml = "
  • " . html::a($link, $label, $target, $misc) . $subMenu . "
  • \n"; echo $menuItemHtml; diff --git a/module/personnel/control.php b/module/personnel/control.php index 1249ba4f69..efa1c286f7 100644 --- a/module/personnel/control.php +++ b/module/personnel/control.php @@ -225,7 +225,7 @@ class personnel extends control public function setProgramMenu($programID = 0) { $this->loadModel('program'); - $this->lang->program->switcherMenu = $this->program->getSwitcher($programID, true); + $this->lang->program->switcherMenu = $this->program->getSwitcher($programID); commonModel::setAppObjectID('program', $programID); } } diff --git a/module/program/model.php b/module/program/model.php index 1c28de1157..4bf6fa82bc 100644 --- a/module/program/model.php +++ b/module/program/model.php @@ -372,7 +372,6 @@ class programModel extends model * Get program swapper. * * @param int $programID - * @param bool $active * @access private * @return string */