ENGCOM-1909: Fixes for #15393 #15687

- Merge Pull Request #15687 from simonjanguapa/magento2:2.2-develop - Merged commits: 1. a49618a 2. 28159a3 3. edb3516
magento · Jun 7, 2018 · 5e55f99 · 5e55f99
2 parents 00c6b48 + edb3516
commit 5e55f99
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
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,