From 8d7cc56826be00d043ddf0a4a9ad4c5ef61535f9 Mon Sep 17 00:00:00 2001 From: mayue Date: Wed, 31 Aug 2022 17:03:08 +0800 Subject: [PATCH 1/2] * Fix bug #27112. --- extension/lite/common/ext/lang/de/lite.php | 2 +- extension/lite/common/ext/lang/en/lite.php | 2 +- extension/lite/common/ext/lang/fr/lite.php | 2 +- extension/lite/common/ext/lang/zh-cn/lite.php | 2 +- extension/lite/product/ext/model/getpairs.php | 3 ++- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/extension/lite/common/ext/lang/de/lite.php b/extension/lite/common/ext/lang/de/lite.php index 5096451099..0fe87a3e6b 100644 --- a/extension/lite/common/ext/lang/de/lite.php +++ b/extension/lite/common/ext/lang/de/lite.php @@ -20,7 +20,7 @@ if($config->edition != 'open') $lang->navIcons['oa'] = ""; $lang->navIcons['workflow'] = ""; - $lang->mainNav->feedback = $lang->navIcons['feedback'] . 'Feedback|feedback|browse|'; + $lang->mainNav->feedback = $lang->navIcons['feedback'] . 'Feedback|feedback|browse|browseType=unclosed'; $lang->mainNav->oa = $lang->navIcons['oa'] . 'OA|attend|personal|'; $lang->mainNav->workflow = $lang->navIcons['workflow'] . 'Workflow|workflow|browseFlow|'; diff --git a/extension/lite/common/ext/lang/en/lite.php b/extension/lite/common/ext/lang/en/lite.php index 5096451099..0fe87a3e6b 100644 --- a/extension/lite/common/ext/lang/en/lite.php +++ b/extension/lite/common/ext/lang/en/lite.php @@ -20,7 +20,7 @@ if($config->edition != 'open') $lang->navIcons['oa'] = ""; $lang->navIcons['workflow'] = ""; - $lang->mainNav->feedback = $lang->navIcons['feedback'] . 'Feedback|feedback|browse|'; + $lang->mainNav->feedback = $lang->navIcons['feedback'] . 'Feedback|feedback|browse|browseType=unclosed'; $lang->mainNav->oa = $lang->navIcons['oa'] . 'OA|attend|personal|'; $lang->mainNav->workflow = $lang->navIcons['workflow'] . 'Workflow|workflow|browseFlow|'; diff --git a/extension/lite/common/ext/lang/fr/lite.php b/extension/lite/common/ext/lang/fr/lite.php index 5096451099..0fe87a3e6b 100644 --- a/extension/lite/common/ext/lang/fr/lite.php +++ b/extension/lite/common/ext/lang/fr/lite.php @@ -20,7 +20,7 @@ if($config->edition != 'open') $lang->navIcons['oa'] = ""; $lang->navIcons['workflow'] = ""; - $lang->mainNav->feedback = $lang->navIcons['feedback'] . 'Feedback|feedback|browse|'; + $lang->mainNav->feedback = $lang->navIcons['feedback'] . 'Feedback|feedback|browse|browseType=unclosed'; $lang->mainNav->oa = $lang->navIcons['oa'] . 'OA|attend|personal|'; $lang->mainNav->workflow = $lang->navIcons['workflow'] . 'Workflow|workflow|browseFlow|'; diff --git a/extension/lite/common/ext/lang/zh-cn/lite.php b/extension/lite/common/ext/lang/zh-cn/lite.php index c74deb3e3f..41107a0d5f 100644 --- a/extension/lite/common/ext/lang/zh-cn/lite.php +++ b/extension/lite/common/ext/lang/zh-cn/lite.php @@ -20,7 +20,7 @@ if($config->edition != 'open') $lang->navIcons['oa'] = ""; $lang->navIcons['workflow'] = ""; - $lang->mainNav->feedback = $lang->navIcons['feedback'] . '反馈|feedback|browse|'; + $lang->mainNav->feedback = $lang->navIcons['feedback'] . '反馈|feedback|browse|browseType=unclosed'; $lang->mainNav->oa = $lang->navIcons['oa'] . '办公|attend|personal|'; $lang->mainNav->workflow = $lang->navIcons['workflow'] . '工作流|workflow|browseFlow|'; diff --git a/extension/lite/product/ext/model/getpairs.php b/extension/lite/product/ext/model/getpairs.php index 44e83114bf..751c9cdfab 100644 --- a/extension/lite/product/ext/model/getpairs.php +++ b/extension/lite/product/ext/model/getpairs.php @@ -5,9 +5,10 @@ * @param string $mode * @param string $programID * @param string|array $append + * @param object $pager * @return array */ -public function getPairs($mode = '', $programID = 0, $append = '') +public function getPairs($mode = '', $programID = 0, $append = '', $pager = NULL) { if(defined('TUTORIAL')) return $this->loadModel('tutorial')->getProductPairs(); From c1c4a8349ba8198a853a1e171bae08957a3e3263 Mon Sep 17 00:00:00 2001 From: mayue Date: Wed, 31 Aug 2022 17:10:08 +0800 Subject: [PATCH 2/2] * Optimize code. --- extension/lite/product/ext/model/getpairs.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/extension/lite/product/ext/model/getpairs.php b/extension/lite/product/ext/model/getpairs.php index 751c9cdfab..44e83114bf 100644 --- a/extension/lite/product/ext/model/getpairs.php +++ b/extension/lite/product/ext/model/getpairs.php @@ -5,10 +5,9 @@ * @param string $mode * @param string $programID * @param string|array $append - * @param object $pager * @return array */ -public function getPairs($mode = '', $programID = 0, $append = '', $pager = NULL) +public function getPairs($mode = '', $programID = 0, $append = '') { if(defined('TUTORIAL')) return $this->loadModel('tutorial')->getProductPairs();