From 02ff58e4e1a8c982fba2990b08b1c96a67b202e2 Mon Sep 17 00:00:00 2001
From: holan20180123 <56391770@qq.com>
Date: Thu, 17 Sep 2020 11:35:17 +0800
Subject: [PATCH 1/3] * Finish task #8018.
---
module/todo/control.php | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/module/todo/control.php b/module/todo/control.php
index 831fb5621f..13c4c2ba91 100644
--- a/module/todo/control.php
+++ b/module/todo/control.php
@@ -558,10 +558,11 @@ class todo extends control
$this->post->set('fields', $fields);
$this->post->set('rows', $todos);
- $this->post->set('kind', 'todo');
+ $this->post->set('kind', $this->lang->todo->common);
$this->fetch('file', 'export2' . $this->post->fileType, $_POST);
}
+ $this->view->fileName = $this->app->user->account . ' - ' . $this->lang->todo->common;
$this->display();
}
From bb62616ba3086dc723e500d8767cca29b69a1f7a Mon Sep 17 00:00:00 2001
From: holan20180123 <56391770@qq.com>
Date: Thu, 17 Sep 2020 14:11:50 +0800
Subject: [PATCH 2/3] * Finish task #7982.
---
framework/router.class.php | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/framework/router.class.php b/framework/router.class.php
index 252abea024..5c1d3bffe6 100755
--- a/framework/router.class.php
+++ b/framework/router.class.php
@@ -559,6 +559,12 @@ class router extends baseRouter
$passedParams = array_reverse($passedParams);
}
+ /* Fix bug #3267. Param 'words' is not validated when searching. */
+ if($this->rawModule == 'search' and $this->rawMethod == 'index')
+ {
+ unset($passedParams['words']);
+ }
+
/* display参数用来标记请求是否来自禅道客户端的卡片展示页面，此处应该删掉以避免对方法调用产生影响。 */
/* The display parameter is used to mark whether the request comes from the card display page of the ZenTao client. It should be deleted here to avoid affecting the method call. */
unset($passedParams['display']);
From cb4b68c14b40f6abc7298b96bd55c479d0cae52c Mon Sep 17 00:00:00 2001
From: holan20180123 <56391770@qq.com>
Date: Thu, 17 Sep 2020 14:38:14 +0800
Subject: [PATCH 3/3] * Finish task #7997.
---
module/install/view/step4.html.php | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/module/install/view/step4.html.php b/module/install/view/step4.html.php
index 6be22c42b3..3cb0492cbb 100644
--- a/module/install/view/step4.html.php
+++ b/module/install/view/step4.html.php
@@ -10,6 +10,7 @@
*/
?>
+