Update Output.php

simonjanguapa · web-flow · commit a49618ada2a3 · 2018-06-02T12:51:07.000+02:00
diff --git a/app/code/Magento/Catalog/Helper/Output.php b/app/code/Magento/Catalog/Helper/Output.php
@@ -151,7 +151,7 @@ public function productAttribute($product, $attributeHtml, $attributeName)
                 $attributeHtml = nl2br($attributeHtml);
             }
         }
-        if ($attribute->getIsHtmlAllowedOnFront() && $attribute->getIsWysiwygEnabled()) {
+        if ($attribute->getIsHtmlAllowedOnFront() || $attribute->getIsWysiwygEnabled()) {
             if ($this->_catalogData->isUrlDirectivesParsingAllowed()) {
                 $attributeHtml = $this->_getTemplateProcessor()->filter($attributeHtml);
             }

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ public function productAttribute($product, $attributeHtml, $attributeName)`
`151`	`151`	`$attributeHtml = nl2br($attributeHtml);`
`152`	`152`	`}`
`153`	`153`	`}`
`154`		`- if ($attribute->getIsHtmlAllowedOnFront() && $attribute->getIsWysiwygEnabled()) {`
	`154`	`+ if ($attribute->getIsHtmlAllowedOnFront() \|\| $attribute->getIsWysiwygEnabled()) {`
`155`	`155`	`if ($this->_catalogData->isUrlDirectivesParsingAllowed()) {`
`156`	`156`	`$attributeHtml = $this->_getTemplateProcessor()->filter($attributeHtml);`
`157`	`157`	`}`