Merge remote-tracking branch 'origin/MAGETWO-35359' into BUGS

AndriyNasinnyk · AndriyNasinnyk · commit 7767aee49b54 · 2015-03-20T13:18:48.000+02:00
diff --git a/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone.php b/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone.php
@@ -197,7 +197,11 @@ public function formatDate($date = null, $format = \IntlDateFormatter::SHORT, $s
     public function scopeTimeStamp($scope = null)
     {
         $timezone = $this->_scopeConfig->getValue($this->getDefaultTimezonePath(), $this->_scopeType, $scope);
-        return (new \DateTime('now', new \DateTimeZone($timezone ?: 'UTC')))->getTimestamp();
+        $currentTimezone = @date_default_timezone_get();
+        @date_default_timezone_set($timezone);
+        $date = date('Y-m-d H:i:s');
+        @date_default_timezone_set($currentTimezone);
+        return strtotime($date);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,11 @@ public function formatDate($date = null, $format = \IntlDateFormatter::SHORT, $s`
`197`	`197`	`public function scopeTimeStamp($scope = null)`
`198`	`198`	`{`
`199`	`199`	`$timezone = $this->_scopeConfig->getValue($this->getDefaultTimezonePath(), $this->_scopeType, $scope);`
`200`		`- return (new \DateTime('now', new \DateTimeZone($timezone ?: 'UTC')))->getTimestamp();`
	`200`	`+ $currentTimezone = @date_default_timezone_get();`
	`201`	`+ @date_default_timezone_set($timezone);`
	`202`	`+ $date = date('Y-m-d H:i:s');`
	`203`	`+ @date_default_timezone_set($currentTimezone);`
	`204`	`+ return strtotime($date);`
`201`	`205`	`}`
`202`	`206`
`203`	`207`	`/**`