From 1c3631bede881e1e60b4422b091f228bc156ac2d Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Sat, 13 Aug 2016 11:29:01 +1000
Subject: [PATCH] Datepicker can use an expressed date for default value
 @Carbon::parse was still failing, wrapped in do nothing try/catch instead We
 don't seem to need to prefix time values anymore, since
 DateTimeHelper::makeCarbon should handle it Fixes #2299

---
 modules/backend/formwidgets/DatePicker.php | 10 +++-------
 modules/system/helpers/DateTime.php        |  6 ++++--
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/modules/backend/formwidgets/DatePicker.php b/modules/backend/formwidgets/DatePicker.php
index b02cdb87a..9bf8e1f1f 100644
--- a/modules/backend/formwidgets/DatePicker.php
+++ b/modules/backend/formwidgets/DatePicker.php
@@ -89,14 +89,10 @@ class DatePicker extends FormWidgetBase
 
 
         if ($value = $this->getLoadValue()) {
-            $value = $value instanceof Carbon ? $value->toDateTimeString() : $value;
 
-            /*
-             * Time
-             */
-            if (strlen($value) <= 8) {
-                $value = Carbon::now()->toDateString() . ' ' . $value;
-            }
+            $value = DateTimeHelper::makeCarbon($value, false);
+
+            $value = $value instanceof Carbon ? $value->toDateTimeString() : $value;
         }
 
         /*
diff --git a/modules/system/helpers/DateTime.php b/modules/system/helpers/DateTime.php
index 43f2e56c4..45522071a 100644
--- a/modules/system/helpers/DateTime.php
+++ b/modules/system/helpers/DateTime.php
@@ -2,9 +2,9 @@
 
 use Lang;
 use Carbon\Carbon;
-use Exception;
 use DateTime as PhpDateTime;
 use InvalidArgumentException;
+use Exception;
 
 class DateTime
 {
@@ -67,7 +67,9 @@ class DateTime
             $value = Carbon::createFromFormat('Y-m-d', $value)->startOfDay();
         }
         else {
-            $value = @Carbon::parse($value);
+            try {
+                $value = Carbon::parse($value);
+            } catch (Exception $ex) {}
         }
 
         if (!$value instanceof Carbon && $throwException) {