Skip to content

Commit c0f9508

Browse files
committed
Fix issue #6999: Configurable attribute cache was never hit
1 parent 6619bdf commit c0f9508

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -443,15 +443,15 @@ public function getConfigurableAttributes($product)
443443
*/
444444
protected function hasCacheData($configurableAttributes)
445445
{
446-
$configurableAttributes = $configurableAttributes ?: unserialize($configurableAttributes);
447-
if (is_array($configurableAttributes) && count($configurableAttributes)) {
446+
$configurableAttributes = $configurableAttributes ? unserialize($configurableAttributes) : $configurableAttributes;
447+
if ((is_array($configurableAttributes) || $configurableAttributes instanceof \Traversable) && count($configurableAttributes)) {
448448
foreach ($configurableAttributes as $attribute) {
449449
/** @var \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute $attribute */
450450
if ($attribute->getData('options')) {
451451
return $configurableAttributes;
452452
}
453453
}
454-
}
454+
}
455455
return false;
456456
}
457457

0 commit comments

Comments
 (0)