From 96adea19b97df2ee37b9f7ca8ea07b3f36bba9b2 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Wed, 5 Feb 2020 10:57:50 +0800
Subject: [PATCH]  * finish task #6837.

---
 module/search/config.php | 7 +++++++
 module/search/model.php  | 1 +
 2 files changed, 8 insertions(+)

diff --git a/module/search/config.php b/module/search/config.php
index 11ec905aee..50dfb3a2f3 100644
--- a/module/search/config.php
+++ b/module/search/config.php
@@ -1,3 +1,10 @@
 <?php
 $config->search = new stdclass();
 $config->search->groupItems = 3;
+
+$config->search->dynamic['$lastMonth'] = '$lastMonth';
+$config->search->dynamic['$thisMonth'] = '$thisMonth';
+$config->search->dynamic['$lastWeek']  = '$lastWeek';
+$config->search->dynamic['$thisWeek']  = '$thisWeek';
+$config->search->dynamic['$yesterday'] = '$yesterday';
+$config->search->dynamic['$today']     = '$today';
diff --git a/module/search/model.php b/module/search/model.php
index f113cad889..0c1dc796aa 100644
--- a/module/search/model.php
+++ b/module/search/model.php
@@ -149,6 +149,7 @@ class searchModel extends model
             }
             else
             {
+                if($operator == 'between' and !isset($this->config->search->dynamic[$value])) $operator = '=';
                 $condition = $operator . ' ' . $this->dbh->quote($value) . ' ';
             }