Fix website-specific attribute values not loading correctly (#4745)

* Fix: Use XML-configured attribute collection or eav/entity_attribute_collection as default

* fix issues with eav cache

* if collection supports per-website values, set website id

* php-cs-fix

* Use instanceof check instead of method_exists for website-specific attribute value

---------

Co-authored-by: Ng Kiat Siong <[email protected]>

Author: empiricompany

app/code/core/Mage/Eav/Model/Config.php

@@ -224,9 +224,16 @@ protected function _loadEntityAttributes($entityType, $storeId)
     {
         // preload attributes in array form to avoid instantiating
         // models for every attribute even if it is never accessed
-        $entityAttributes = $entityType->newAttributeCollection()
-            ->addStoreLabel($storeId)
-            ->getData();
+        $collection = $entityType->newAttributeCollection()
+            ->addStoreLabel($storeId);
+
+        // if collection supports per-website values, set website id
+        if ($collection instanceof Mage_Eav_Model_Resource_Attribute_Collection) {
+            $websiteId = Mage::app()->getStore($storeId)->getWebsiteId();
+            $collection->setWebsite($websiteId);
+        }
+
+        $entityAttributes = $collection->getData();
 
         $this->_entityTypeAttributes[$storeId][$entityType->getId()] = [];
         $attributeCodes = [];

app/code/core/Mage/Eav/Model/Entity/Type.php

@@ -140,7 +140,8 @@ public function newAttributeCollection($setId = null)
      */
     protected function _getAttributeCollection()
     {
-        $collection = Mage::getModel('eav/entity_attribute')->getCollection();
+        $collectionClass = $this->getEntityAttributeCollection();
+        $collection = Mage::getResourceModel($collectionClass);
         $objectsModel = $this->getAttributeModel();
         if ($objectsModel) {
             $collection->setModel($objectsModel);