Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -140,12 +140,16 @@ public function getAttributesRawData($storeId, array $entityIds, $tableName, arr
['attribute_id', 'attribute_code']
)
->where("entity.{$entityIdField} IN (?)", $entityIds)
->where("t_attribute.attribute_id IN (?)", $attributeIds)
->where("t_attribute.value IS NOT NULL");
->where("t_attribute.attribute_id IN (?)", $attributeIds);

// Get the result and override values from a previous loop.
foreach ($this->connection->fetchAll($select) as $row) {
$key = "{$row['entity_id']}-{$row['attribute_id']}";
if ($row['value'] === null) {
// When an attribute value is explicitly set to null in a higher-priority scope, do not use the fallback value.
unset($result[$key]);
continue;
}
$result[$key] = $row;
}
}
Expand Down
Loading