Merge branch 'main' into next

Author: fballiano

app/code/core/Mage/Catalog/Model/Attribute/Backend/Customlayoutupdate.php

@@ -32,7 +32,7 @@ class Mage_Catalog_Model_Attribute_Backend_Customlayoutupdate extends Mage_Eav_M
     public function validate($object)
     {
         $attributeName = $this->getAttribute()->getName();
-        $xml = trim($object->getData($attributeName));
+        $xml = trim((string)$object->getData($attributeName));
 
         if (!$this->getAttribute()->getIsRequired() && empty($xml)) {
             return true;
@@ -42,7 +42,7 @@ public function validate($object)
         $validator = Mage::getModel('adminhtml/layoutUpdate_validator');
         if (!$validator->isValid($xml)) {
             $messages = $validator->getMessages();
-            //Add first message to exception
+            // add first message to exception
             $massage = array_shift($messages);
             $eavExc = new Mage_Eav_Model_Entity_Attribute_Exception($massage);
             $eavExc->setAttributeCode($attributeName);

app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable/Attribute/Collection.php

@@ -230,10 +230,10 @@ protected function _loadPrices()
             $sortOrder = 1;
             foreach ($this->_items as $item) {
                 $productAttribute = $item->getProductAttribute();
-                $productAttributeCode = $productAttribute->getAttributeCode();
                 if (!($productAttribute instanceof Mage_Eav_Model_Entity_Attribute_Abstract)) {
                     continue;
                 }
+                $productAttributeCode = $productAttribute->getAttributeCode();
                 $options = $productAttribute->getFrontend()->getSelectOptions();
 
                 $optionsByValue = [];