Merge pull request #23708 from eileenmcnaughton/date

dev/core#2325 Fix handling of seconds on import
civicrm · Jun 7, 2022 · c7e9b07 · c7e9b07
2 parents ed4c0b2 + 110eeb3
commit c7e9b07
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/CRM/Utils/Date.php b/CRM/Utils/Date.php
@@ -2125,7 +2125,7 @@ public static function formatDate($date, $dateType) {
       $ruleName = 'date';
       if ($dateType == 1) {
         $matches = [];
-        if (preg_match("/(\s(([01]\d)|[2][0-3]):([0-5]\d))$/", $date, $matches)) {
+        if (preg_match("/(\s(([01]\d)|[2][0-3]):([0-5]\d):?[0-5]?\d?)$/", $date, $matches)) {
           $ruleName = 'dateTime';
           if (strpos($date, '-') !== FALSE) {
             $dateVal .= array_shift($matches);