Skip to content

Commit 858ec1f

Browse files
committed
Merge remote-tracking branch 'tango/MC-20108' into Chaika-PR-2019-09-15
2 parents 5ee35e5 + 0d43912 commit 858ec1f

File tree

1 file changed

+1
-8
lines changed
  • app/code/Magento/Ui/Component/Form/Element/DataType

1 file changed

+1
-8
lines changed

app/code/Magento/Ui/Component/Form/Element/DataType/Date.php

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -111,14 +111,7 @@ public function getComponentName()
111111
public function convertDate($date, $hour = 0, $minute = 0, $second = 0, $setUtcTimeZone = true)
112112
{
113113
try {
114-
$dateObj = $this->localeDate->date(
115-
new \DateTime(
116-
$date,
117-
new \DateTimeZone($this->localeDate->getConfigTimezone())
118-
),
119-
$this->getLocale(),
120-
true
121-
);
114+
$dateObj = $this->localeDate->date($date, $this->getLocale(), true);
122115
$dateObj->setTime($hour, $minute, $second);
123116
//convert store date to default date in UTC timezone without DST
124117
if ($setUtcTimeZone) {

0 commit comments

Comments
 (0)