File tree Expand file tree Collapse file tree 1 file changed +13
-1
lines changed
lib/internal/Magento/Framework/Stdlib/DateTime Expand file tree Collapse file tree 1 file changed +13
-1
lines changed Original file line number Diff line number Diff line change @@ -309,11 +309,23 @@ public function formatDateTime(
309
309
*/
310
310
public function convertConfigTimeToUtc ($ date , $ format = 'Y-m-d H:i:s ' )
311
311
{
312
+ $ formatter = new \IntlDateFormatter (
313
+ $ this ->_localeResolver ->getLocale (),
314
+ \IntlDateFormatter::MEDIUM ,
315
+ \IntlDateFormatter::MEDIUM ,
316
+ $ this ->getConfigTimezone (),
317
+ null ,
318
+ null
319
+ );
320
+ $ unixTime = $ formatter ->parse ($ date );
321
+ $ dateTime = new DateTime ($ this );
322
+
312
323
if (!($ date instanceof \DateTimeInterface)) {
313
324
if ($ date instanceof \DateTimeImmutable) {
314
325
$ date = new \DateTime ($ date ->format ('Y-m-d H:i:s ' ), new \DateTimeZone ($ this ->getConfigTimezone ()));
315
326
} else {
316
- $ date = new \DateTime ($ date , new \DateTimeZone ($ this ->getConfigTimezone ()));
327
+ $ dateUniversal = $ dateTime ->gmtDate (null , $ unixTime );
328
+ $ date = new \DateTime ($ dateUniversal , new \DateTimeZone ($ this ->getConfigTimezone ()));
317
329
}
318
330
} else {
319
331
if ($ date ->getTimezone ()->getName () !== $ this ->getConfigTimezone ()) {
You can’t perform that action at this time.
0 commit comments