From 82868801489dcbeeb02e74f9e212f2b9c8014286 Mon Sep 17 00:00:00 2001 From: Scott Bedard Date: Sat, 27 Dec 2014 17:33:27 -0500 Subject: [PATCH] Valid strtotime() format when time is left empty Date-type laravel validation ("date", "before", and "after") may not be used with datetime widgets containing empty time fields because they are not in a valid strtotime() format (example: 2014-12-27 :00). This extra check ensures a valid strtotime() format by only adding the ":00" seconds value when a time value is present. --- modules/backend/formwidgets/DatePicker.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/backend/formwidgets/DatePicker.php b/modules/backend/formwidgets/DatePicker.php index 7b2d1aa44..dc9cc3ccd 100644 --- a/modules/backend/formwidgets/DatePicker.php +++ b/modules/backend/formwidgets/DatePicker.php @@ -126,8 +126,8 @@ class DatePicker extends FormWidgetBase return null; } - if ($this->mode == 'datetime') { - $value .= ' ' . post(self::TIME_PREFIX.$this->formField->getName(false)) . ':00'; + if ($this->mode == 'datetime' && $timeValue = post(self::TIME_PREFIX.$this->formField->getName(false))) { + $value .= ' ' . $timeValue . ':00'; } elseif ($this->mode == 'time') { $value .= ':00';