Merge branch '1.9.4.x' into setpart_is_wrong

OpenMage · Mar 2, 2023 · adfdc4d · adfdc4d
2 parents 9450cbc + 74beed6
commit adfdc4d
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Category/Flat.php b/app/code/core/Mage/Catalog/Model/Resource/Category/Flat.php
@@ -839,7 +839,9 @@ protected function _getAttributeValues($entityIds, $store_id)
         ];
         foreach ($attributesType as $type) {
             foreach ($this->_getAttributeTypeValues($type, $entityIds, $store_id) as $row) {
-                $values[$row['entity_id']][$attributes[$row['attribute_id']]['attribute_code']] = $row['value'];
+                if (isset($attributes[$row['attribute_id']])) {
+                    $values[$row['entity_id']][$attributes[$row['attribute_id']]['attribute_code']] = $row['value'];
+                }
             }
         }
         return $values;