Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop

This commit is contained in:
James Cole 2019-12-30 11:35:30 +01:00
commit ecb9141921

View File

@ -142,7 +142,7 @@ class ImportableConverter
try { try {
// add exclamation mark for better parsing. http://php.net/manual/en/datetime.createfromformat.php // add exclamation mark for better parsing. http://php.net/manual/en/datetime.createfromformat.php
$dateFormat = $this->config['date-format'] ?? 'Ymd'; $dateFormat = $this->config['date-format'] ?? 'Ymd';
if ('!' !== $dateFormat{0}) { if ('!' !== $dateFormat[0]) {
$dateFormat = '!' . $dateFormat; $dateFormat = '!' . $dateFormat;
} }
$object = Carbon::createFromFormat($dateFormat, $date); $object = Carbon::createFromFormat($dateFormat, $date);