Skip to content

Commit

Permalink
MAGETWO-69909: By default, show times in admin grids in the store tim…
Browse files Browse the repository at this point in the history
…ezone. #9941

 - Merge Pull Request #9941 from ajpevers/magento2:issue-9426
 - Merged commits:
   1. 049cc45
  • Loading branch information
Oleksii Korshenko committed Jun 15, 2017
2 parents 04b3b52 + 049cc45 commit e874c7d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion app/code/Magento/Ui/Component/Listing/Columns/Date.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public function prepareDataSource(array $dataSource)
$date = $this->timezone->date(new \DateTime($item[$this->getData('name')]));
$timezone = isset($this->getConfiguration()['timezone'])
? $this->booleanUtils->convert($this->getConfiguration()['timezone'])
: false;
: true;
if (!$timezone) {
$date = new \DateTime($item[$this->getData('name')]);
}
Expand Down

0 comments on commit e874c7d

Please sign in to comment.