Skip to content

Commit 444c4b0

Browse files
authored
Fixed bug on incorrect date format for 1970-01-01 date. (#3802)
1 parent 208165c commit 444c4b0

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

app/code/core/Mage/Core/Helper/Data.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ public function formatDate($date = null, $format = Mage_Core_Model_Locale::FORMA
162162
} elseif (is_int($date)) {
163163
$date = Mage::app()->getLocale()->date($date, null, null, $useTimezone);
164164
} elseif (!$date instanceof Zend_Date) {
165-
if ($time = strtotime($date)) {
165+
if (($time = strtotime($date)) !== false) {
166166
$date = Mage::app()->getLocale()->date($time, null, null, $useTimezone);
167167
} else {
168168
return '';

app/code/core/Mage/Core/Model/Locale.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,7 @@ public function date($date = null, $part = null, $locale = null, $useTimezone =
518518
$locale = $this->getLocale();
519519
}
520520

521-
if (empty($date)) {
521+
if (!is_int($date) && empty($date)) {
522522
// $date may be false, but Zend_Date uses strict compare
523523
$date = null;
524524
}

0 commit comments

Comments
 (0)