Merge branch 'main' into next

OpenMage · May 4, 2023 · b639beb · b639beb
2 parents 0a16e58 + 6b683d7
commit b639beb
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 13 deletions.
diff --git a/app/code/core/Mage/Sales/Model/Order/Config.php b/app/code/core/Mage/Sales/Model/Order/Config.php
@@ -28,6 +28,13 @@ class Mage_Sales_Model_Order_Config extends Mage_Core_Model_Config_Base
      */
     protected $_stateStatuses;
 
+    /**
+     * Statuses array
+     *
+     * @var array
+     */
+    protected $_statuses;
+
     /**
      * States array
      *
@@ -84,9 +91,12 @@ public function getStateDefaultStatus($state)
      */
     public function getStatusLabel($code)
     {
-        $status = Mage::getModel('sales/order_status')
-            ->load($code);
-        return $status->getStoreLabel();
+        $key = $code . '/' . Mage::app()->getStore()->getStoreId();
+        if (!isset($this->_statuses[$key])) {
+            $status = Mage::getModel('sales/order_status')->load($code);
+            $this->_statuses[$key] = $status->getStoreLabel();
+        }
+        return $this->_statuses[$key];
     }
 
     /**

diff --git a/app/design/frontend/base/default/template/googleanalytics/ga.phtml b/app/design/frontend/base/default/template/googleanalytics/ga.phtml
@@ -14,6 +14,7 @@
  */
 ?>
 <?php
+/** @var Mage_GoogleAnalytics_Block_Ga $this */
 $_helper = $this->helper('googleanalytics');
 $_accountId = $_helper->getAccountId();
 ?>

diff --git a/skin/frontend/rwd/default/js/msrp_rwd.js b/skin/frontend/rwd/default/js/msrp_rwd.js
@@ -14,19 +14,15 @@
 Catalog.Map.showHelp = Catalog.Map.showHelp.wrap(function (parent, event) {
     var helpBox = document.getElementById('map-popup');
     var bodyNode = document.getElementsByTagName('body')[0];
-
-    // Resolve calculation bug in parent so we can actually use these classes...
+    parent(event);
+
     if (helpBox && this != Catalog.Map && Catalog.Map.active != this.link) {
-        parent(event);
-
-        helpBox.removeClassName('map-popup-right');
-        helpBox.removeClassName('map-popup-left');
+        helpBox.classList.remove('map-popup-right');
+        helpBox.classList.remove('map-popup-left');
         if (Element.getWidth(bodyNode) < event.pageX + (Element.getWidth(helpBox) / 2)) {
-            helpBox.addClassName('map-popup-left');
+            helpBox.classList.add('map-popup-left');
         } else if (event.pageX - (Element.getWidth(helpBox) / 2) < 0) {
-            helpBox.addClassName('map-popup-right');
+            helpBox.classList.add('map-popup-right');
         }
-    } else {
-        parent(event);
     }
 });