diff --git a/modules/backend/formwidgets/DatePicker.php b/modules/backend/formwidgets/DatePicker.php index da774b90b..5bfaea068 100644 --- a/modules/backend/formwidgets/DatePicker.php +++ b/modules/backend/formwidgets/DatePicker.php @@ -90,13 +90,13 @@ class DatePicker extends FormWidgetBase $this->mode = strtolower($this->mode); if ($this->minDate !== null) { - $this->minDate = is_integer($this->minDate) + $this->minDate = is_int($this->minDate) ? Carbon::createFromTimestamp($this->minDate) : Carbon::parse($this->minDate); } if ($this->maxDate !== null) { - $this->maxDate = is_integer($this->maxDate) + $this->maxDate = is_int($this->maxDate) ? Carbon::createFromTimestamp($this->maxDate) : Carbon::parse($this->maxDate); } diff --git a/modules/cms/twig/DebugExtension.php b/modules/cms/twig/DebugExtension.php index cf58389b5..f747e8c02 100644 --- a/modules/cms/twig/DebugExtension.php +++ b/modules/cms/twig/DebugExtension.php @@ -608,6 +608,6 @@ class DebugExtension extends Twig_Extension $strings[] = $key . ': ' . $value; } - return join('; ', $strings); + return implode('; ', $strings); } }