Skip to content

Commit

Permalink
backport 2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
manuelson committed Oct 27, 2017
1 parent 9adbca7 commit 4e24f73
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions app/code/Magento/Catalog/Block/Product/View/Attributes.php
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,9 @@ public function getAdditionalData(array $excludeAttr = [])
$attributes = $product->getAttributes();
foreach ($attributes as $attribute) {
if ($attribute->getIsVisibleOnFront() && !in_array($attribute->getAttributeCode(), $excludeAttr)) {
$value = $attribute->getFrontend()->getValue($product);

if (is_array($value = $attribute->getFrontend()->getValue($product))) {
continue;
}
if (!$product->hasData($attribute->getAttributeCode())) {
$value = __('N/A');
} elseif ((string)$value == '') {
Expand Down

0 comments on commit 4e24f73

Please sign in to comment.