File tree Expand file tree Collapse file tree 1 file changed +7
-4
lines changed Expand file tree Collapse file tree 1 file changed +7
-4
lines changed Original file line number Diff line number Diff line change @@ -83,15 +83,18 @@ protected function getDateConverterConfiguration()
83
83
*/
84
84
public function convert ($ date , $ format = 'Y-m-d H:i:s ' )
85
85
{
86
- // create a DateTime instance from the passed value
87
- if ($ dateTime = new \DateTime ($ date )) {
88
- return $ dateTime ->format ($ format );
89
- }
90
86
// create a DateTime instance from the passed value
91
87
if ($ dateTime = \DateTime::createFromFormat ($ this ->getDateConverterConfiguration ()->getSourceDateFormat (), $ date )) {
92
88
return $ dateTime ->format ($ format );
93
89
}
94
90
91
+ // Date is not in configured format? Try if is a default format
92
+ try {
93
+ return (new \DateTime ($ date ))->format ($ format );
94
+ } catch ( \Exception $ e ) {
95
+ // Catch if $date is no default date format
96
+ }
97
+
95
98
// return NULL, if the passed value is NOT a valid date
96
99
return null ;
97
100
}
You can’t perform that action at this time.
0 commit comments