diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View.php index 3367ae65e3c4..810a125f3c69 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View.php @@ -83,7 +83,7 @@ public function getCreateDate() if (!$date) { return null; } - return $this->formatDate( + return $this->_getCoreHelper()->formatTimezoneDate( $date, Mage_Core_Model_Locale::FORMAT_TYPE_MEDIUM, true, @@ -122,7 +122,7 @@ public function getLastLoginDate() { $date = $this->getCustomerLog()->getLoginAtTimestamp(); if ($date) { - return Mage::helper('core')->formatDate($date, Mage_Core_Model_Locale::FORMAT_TYPE_MEDIUM, true, false); + return Mage::helper('core')->formatTimezoneDate($date, Mage_Core_Model_Locale::FORMAT_TYPE_MEDIUM, true, false); } return Mage::helper('customer')->__('Never'); } @@ -260,7 +260,6 @@ public function isHidden() * Return instance of core helper * * @return Mage_Core_Helper_Data - * @deprecated */ protected function _getCoreHelper() { diff --git a/app/code/core/Mage/Core/Block/Abstract.php b/app/code/core/Mage/Core/Block/Abstract.php index b9b8a8207c21..988331dd4342 100644 --- a/app/code/core/Mage/Core/Block/Abstract.php +++ b/app/code/core/Mage/Core/Block/Abstract.php @@ -1126,11 +1126,11 @@ public function helper($name) * @param bool $useTimezone * @return string */ - public function formatDate($date = null, $format = Mage_Core_Model_Locale::FORMAT_TYPE_SHORT, $showTime = false, $useTimezone = true) + public function formatDate($date = null, $format = Mage_Core_Model_Locale::FORMAT_TYPE_SHORT, $showTime = false) { /** @var Mage_Core_Helper_Data $helper */ $helper = $this->helper('core'); - return $helper->formatDate($date, $format, $showTime, $useTimezone); + return $helper->formatDate($date, $format, $showTime); } /** diff --git a/app/code/core/Mage/Core/Helper/Data.php b/app/code/core/Mage/Core/Helper/Data.php index f24dd94b20f2..9e1bf90f0a2e 100644 --- a/app/code/core/Mage/Core/Helper/Data.php +++ b/app/code/core/Mage/Core/Helper/Data.php @@ -153,13 +153,26 @@ public function formatPrice($price, $includeContainer = true) /** * Format date using current locale options and time zone. * - * @param string|Zend_Date|null $date If empty, return current datetime. + * @param string|Zend_Date|null $date If empty, return current datetime. + * @param string $format See Mage_Core_Model_Locale::FORMAT_TYPE_* constants + * @param bool $showTime Whether to include time + * @return string + */ + public function formatDate($date = null, $format = Mage_Core_Model_Locale::FORMAT_TYPE_SHORT, $showTime = false) + { + return $this->formatTimezoneDate($date, $format, $showTime, true); + } + + /** + * Format date using current locale options and time zone. + * + * @param string|Zend_Date|null $date If empty, return current datetime. * @param string $format See Mage_Core_Model_Locale::FORMAT_TYPE_* constants * @param bool $showTime Whether to include time * @param bool $useTimezone Convert to local datetime? * @return string */ - public function formatDate($date = null, $format = Mage_Core_Model_Locale::FORMAT_TYPE_SHORT, $showTime = false, $useTimezone = true) + public function formatTimezoneDate($date = null, $format = Mage_Core_Model_Locale::FORMAT_TYPE_SHORT, $showTime = false, $useTimezone = true) { if (!in_array($format, $this->_allowedFormats, true)) { return $date;