Test for date only value before attempting setTimezone (CFM-509) (#379)

COmanage · Mar 30, 2026 · 4135f09 · 4135f09
1 parent 02d9929
commit 4135f09
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/app/src/View/Helper/FieldHelper.php b/app/src/View/Helper/FieldHelper.php
@@ -349,10 +349,12 @@ public function dateField(string $fieldName,
 
     // Get the existing values, if present
     if($date_object !== null) {
-      // Adjust the time back to the user's timezone
-      $tz = $this->getView()->get('vv_tz');
-      if($tz) {
-        $date_object = $date_object->setTimezone($tz);
+      if($date_object instanceof \Cake\I18n\DateTime) {
+        // Adjust the time back to the user's timezone
+        $tz = $this->getView()->get('vv_tz');
+        if($tz) {
+          $date_object = $date_object->setTimezone($tz);
+        }
       }
       $coptions['value'] = $date_object->i18nFormat($dateFormat);
       $pickerDate = $date_object->i18nFormat($dateFormat);