ENGCOM-1909: Fixes for #15393 #15687

magento-engcom-team · magento-engcom-team · commit 5e55f9982205 · 2018-06-07T04:12:16.000-05:00
- Merge Pull Request #15687 from simonjanguapa/magento2:2.2-develop - Merged commits: 1. a49618a 2. 28159a3 3. edb3516
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);
             }
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Source/Table.php b/app/code/Magento/Eav/Model/Entity/Attribute/Source/Table.php
@@ -167,7 +167,9 @@ public function getOptionText($value)
         $optionsText = [];
         foreach ($options as $item) {
             if (in_array($item['value'], $value)) {
-                $optionsText[] = $this->escaper->escapeHtml($item['label']);
+                $optionsText[] = ($this->_attribute->getIsHtmlAllowedOnFront())
+                    ? $item['label']
+                    : $this->escaper->escapeHtml($item['label']);
             }
         }
 
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductGettersTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductGettersTest.php
@@ -217,7 +217,7 @@ public function testGetAttributeTextArray()
         $expected = [
             'Option 2',
             'Option 3',
-            'Option 4 &quot;!@#$%^&amp;*'
+            'Option 4 "!@#$%^&*'
         ];
         self::assertEquals(
             $expected,

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`	`}`
Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,9 @@ public function getOptionText($value)`
`167`	`167`	`$optionsText = [];`
`168`	`168`	`foreach ($options as $item) {`
`169`	`169`	`if (in_array($item['value'], $value)) {`
`170`		`- $optionsText[] = $this->escaper->escapeHtml($item['label']);`
	`170`	`+ $optionsText[] = ($this->_attribute->getIsHtmlAllowedOnFront())`
	`171`	`+ ? $item['label']`
	`172`	`+ : $this->escaper->escapeHtml($item['label']);`
`171`	`173`	`}`
`172`	`174`	`}`
`173`	`175`