Merge pull request #150 from magento-commerce/fix/catalog-upload-striptags-issue

added conditional check before calling strip_tags and replace strip_t…

Author: bgiamarino

app/code/Meta/Catalog/Model/Product/Feed/Builder.php

@@ -28,6 +28,8 @@
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory as CategoryCollectionFactory;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Escaper;
+use Magento\Framework\Filter\StripTagsFactory;
 use Magento\Customer\Model\GroupManagement;
 
 class Builder
@@ -108,13 +110,24 @@ class Builder
      */
     private $inventoryOnly = false;
 
+    /**
+     * @var Escaper
+     */
+    private $escaper;
+
+    /**
+     * @var StripTagsFactory
+     */
+    private $stripTags;
+
     /**
      * @param FBEHelper $fbeHelper
      * @param SystemConfig $systemConfig
      * @param CategoryCollectionFactory $categoryCollectionFactory
      * @param BuilderTools $builderTools
      * @param ProductIdentifier $productIdentifier
      * @param CatalogHelper $catalogHelper
+     * @param StripTagsFactory $stripTags
      */
     public function __construct(
         FBEHelper                 $fbeHelper,
@@ -123,7 +136,9 @@ public function __construct(
         BuilderTools              $builderTools,
         ProductIdentifier         $productIdentifier,
         CatalogHelper             $catalogHelper,
-        InventoryInterface        $inventory
+        InventoryInterface        $inventory,
+        Escaper                   $escaper,
+        StripTagsFactory          $stripTags
     )
     {
         $this->fbeHelper = $fbeHelper;
@@ -133,6 +148,8 @@ public function __construct(
         $this->productIdentifier = $productIdentifier;
         $this->catalogHelper = $catalogHelper;
         $this->inventory = $inventory;
+        $this->escaper = $escaper;
+        $this->stripTags = $stripTags;
     }
 
     /**
@@ -390,8 +407,12 @@ private function getRichDescription(Product $product)
         if (!$description) {
             $description = $product->getShortDescription();
         }
+        if (!$description) {
+            return '';
+        }
+        $stripTags = $this->stripTags->create([$this->escaper, self::ALLOWED_TAGS_FOR_RICH_TEXT_DESCRIPTION]);
         return $this->trimAttribute(self::ATTR_RICH_DESCRIPTION,
-            strip_tags($description, self::ALLOWED_TAGS_FOR_RICH_TEXT_DESCRIPTION));
+        $stripTags->filter($description));
     }
 
     /**