Skip to content

Commit 181bc32

Browse files
committed
MAGETWO-59810: Reinstate DateTime instantiation fallback
1 parent 316b52a commit 181bc32

File tree

2 files changed

+3
-1
lines changed
  • dev/tests/integration/testsuite/Magento/Framework/Stdlib/DateTime/Filter
  • lib/internal/Magento/Framework/Stdlib/DateTime

2 files changed

+3
-1
lines changed

dev/tests/integration/testsuite/Magento/Framework/Stdlib/DateTime/Filter/DateTimeTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@ public function localeDatetimeFilterProvider()
7171
['fr_FR', '01/02/2010 1:00', '2010-02-01 01:00:00'],
7272
['fr_FR', '01/02/2010 01:00', '2010-02-01 01:00:00'],
7373
['de_DE', '01/02/2010 15:30', '2010-02-01 15:30:00'],
74+
['en_US', '2017-09-01T15:30:00.000Z', '2017-09-01 15:30:00'],
75+
['fr_FR', '2017-09-01T15:30:00.000Z', '2017-09-01 15:30:00'],
7476
];
7577
}
7678
}

lib/internal/Magento/Framework/Stdlib/DateTime/Timezone.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ public function date($date = null, $locale = null, $useTimezone = true, $include
174174
$timeType,
175175
new \DateTimeZone($timezone)
176176
);
177-
$date = $formatter->parse($date);
177+
$date = $formatter->parse($date) ?: (new \DateTime($date))->getTimestamp();
178178
break;
179179
}
180180

0 commit comments

Comments
 (0)