From ddcb709fd15dd2ef5df92e886ae6b127db7bf2c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20Espi=C3=A9?= Date: Fri, 23 Mar 2018 09:21:44 +0000 Subject: [PATCH] Advanced Search: Dates between SVN:b1162[5499] --- .../criterionconversion/criteriontosearchform.class.inc.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php index c330133bc..441c45e9d 100644 --- a/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php +++ b/sources/application/search/criterionconversion/criteriontosearchform.class.inc.php @@ -260,7 +260,8 @@ class CriterionToSearchForm extends CriterionConversionAbstract $sFirstDate = $aCurrCriterion['values'][0]['value']; $oDate = new DateTime($sLastDate); $aCurrCriterion['operator'] = 'between_dates'; - if ((strpos($sFirstDate, '00:00:00') != false) && (strpos($sLastDate, '00:00:00') != false)) + $sPattern = '@^[\d-]{10}( 00:00:00)?$@'; + if (preg_match($sPattern, $sFirstDate) && preg_match($sPattern, $sLastDate)) { $sInterval = '1 day'; }