Reverted code format changes

OpenMage · Dec 26, 2022 · d52f8e9 · d52f8e9
1 parent c41e13f
commit d52f8e9
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
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
@@ -79,9 +79,12 @@ public function getCustomerLog()
      */
     public function getCreateDate()
     {
-        return ($date = $this->getCustomer()->getCreatedAt())
-            ? $this->formatDate($date, Mage_Core_Model_Locale::FORMAT_TYPE_MEDIUM, true, false)
-            : null;
+        $date = $this->getCustomer()->getCreatedAt();
+        if (!$date) {
+            return null;
+        }
+        # toto with usetimezon
+        return $this->formatDate($date,Mage_Core_Model_Locale::FORMAT_TYPE_MEDIUM, true,false);
     }
 
     /**
@@ -248,10 +251,10 @@ public function isHidden()
     }
 
     /**
-     * @deprecated
      * 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
@@ -1128,7 +1128,9 @@ public function helper($name)
      */
     public function formatDate($date = null, $format = Mage_Core_Model_Locale::FORMAT_TYPE_SHORT, $showTime = false, $useTimezone = true)
     {
-        return $this->helper('core')->formatDate($date, $format, $showTime, $useTimezone);
+        /** @var Mage_Core_Helper_Data $helper */
+        $helper = $this->helper('core');
+        return $helper->formatDate($date, $format, $showTime, $useTimezone);
     }
 
     /**

diff --git a/app/code/core/Mage/Core/Helper/Data.php b/app/code/core/Mage/Core/Helper/Data.php
@@ -176,9 +176,11 @@ public function formatDate($date = null, $format = Mage_Core_Model_Locale::FORMA
             }
         }
 
-        $format = $showTime
-            ? Mage::app()->getLocale()->getDateTimeFormat($format)
-            : Mage::app()->getLocale()->getDateFormat($format);
+        if ($showTime) {
+            $format = Mage::app()->getLocale()->getDateTimeFormat($format);
+        } else {
+            $format = Mage::app()->getLocale()->getDateFormat($format);
+        }
 
         return $date->toString($format);
     }