Fix PHP warning.

1.10.x
Julio Montoya 11 years ago
parent 2f775125a0
commit 67f42702ca
  1. 11
      main/inc/lib/formvalidator/Element/DateRangePicker.php

@ -2,7 +2,7 @@
/* For licensing terms, see /license.txt */ /* For licensing terms, see /license.txt */
/** /**
* Form element to select a date and hour (with popup datepicker) * Form element to select a range of dates (with popup datepicker)
*/ */
class DateRangePicker extends HTML_QuickForm_text class DateRangePicker extends HTML_QuickForm_text
{ {
@ -21,7 +21,7 @@ class DateRangePicker extends HTML_QuickForm_text
} }
/** /**
* HTML code to display this datepicker * @return string
*/ */
public function toHtml() public function toHtml()
{ {
@ -100,10 +100,12 @@ class DateRangePicker extends HTML_QuickForm_text
{ {
$dates = explode('/', $dateRange); $dates = explode('/', $dateRange);
$dates = array_map('trim', $dates); $dates = array_map('trim', $dates);
$start = isset($dates[0]) ? $dates[0] : '';
$end = isset($dates[1]) ? $dates[1] : '';
return array( return array(
'start' => $dates[0], 'start' => $start,
'end' => $dates[1] 'end' => $end
); );
} }
@ -117,6 +119,7 @@ class DateRangePicker extends HTML_QuickForm_text
if (empty($dates['start']) || empty($dates['end'])) { if (empty($dates['start']) || empty($dates['end'])) {
return false; return false;
} }
$format = 'Y-m-d H:i'; $format = 'Y-m-d H:i';
$d = DateTime::createFromFormat($format, $dates['start']); $d = DateTime::createFromFormat($format, $dates['start']);
$resultStart = $d && $d->format($format) == $dates['start']; $resultStart = $d && $d->format($format) == $dates['start'];

Loading…
Cancel
Save