Merge pull request #160 from magento-south/MAGETWO-45277

[South] MAGETWO-45277: Timezone fixes for Customer module
magento · Nov 12, 2015 · c4652ba · c4652ba
2 parents 32094af + 76b1dcb
commit c4652ba
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Data/Form/Element/DateTest.php b/dev/tests/integration/testsuite/Magento/Framework/Data/Form/Element/DateTest.php
@@ -42,9 +42,6 @@ public function getValueDataProvider()
     {
         $testTimestamp = strtotime('2014-05-18 12:08:16');
         $date = new \DateTime('@' . $testTimestamp);
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        $timezone = $objectManager->get('Magento\Framework\Stdlib\DateTime\TimezoneInterface');
-        $date->setTimezone(new \DateTimeZone($timezone->getConfigTimezone()));
         return [
             [
                 [

diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Date.php b/lib/internal/Magento/Framework/Data/Form/Element/Date.php
@@ -113,7 +113,14 @@ public function getValue($format = null)
             $format .= ($format && $this->getTimeFormat()) ? ' ' : '';
             $format .= $this->getTimeFormat() ? $this->getTimeFormat() : '';
         }
-        return $this->localeDate->formatDateTime($this->_value, null, null, null, null, $format);
+        return $this->localeDate->formatDateTime(
+            $this->_value,
+            null,
+            null,
+            null,
+            $this->_value->getTimezone(),
+            $format
+        );
     }
 
     /**