bring back time field

diff --git a/CRM/Utils/Date.php b/CRM/Utils/Date.php
index 2434fb33e06c5400e66ccb50c24cb2a5e641f965..dfcff429c3193ddf135128fcc9394d4fa874e725 100644 (file)
--- a/CRM/Utils/Date.php
+++ b/CRM/Utils/Date.php
@@ -1987,7 +1987,7 @@ class CRM_Utils_Date {
           $field['smarty_view_format'] = $dateAttributes['smarty_view_format'];
         }
         $field['datepicker']['extra'] = self::getDatePickerExtra($field);
-        $field['datepicker']['extra']['time'] = $fieldMetaData['type'] == CRM_Utils_Type::T_TIMESTAMP;
+        $field['datepicker']['extra']['time'] = $fieldMetaData['type'] == CRM_Utils_Type::T_TIMESTAMP || $fieldMetaData['type'] == (CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME);
         $field['datepicker']['attributes'] = self::getDatePickerAttributes($field);
       }
     }