Merge pull request #203 from magento-gl/Hammer_Regression_Blocker_issues_16jan22

Hammer_Regression_Blocker_issues_16jan22

Author: sidolov

app/code/Magento/PageBuilder/Model/Filter/Template.php

@@ -170,7 +170,11 @@ function ($errorNumber, $errorString) {
                 throw new DOMException($errorString, $errorNumber);
             }
         );
-        $string = mb_convert_encoding($html, 'HTML-ENTITIES', 'UTF-8');
+        $string = mb_encode_numericentity(
+            $html,
+            ['HTML-ENTITIES','','',''],
+            'UTF-8'
+        );
         try {
             libxml_use_internal_errors(true);
             // LIBXML_SCHEMA_CREATE option added according to this message

app/code/Magento/PageBuilder/Model/Stage/HtmlFilter.php

@@ -41,11 +41,16 @@ public function __construct(
     public function filterHtml(string $content): string
     {
         $dom = new \DOMDocument('1.0', 'UTF-8');
+        $previous = '';
         try {
             //this code is required because of https://bugs.php.net/bug.php?id=60021
             $previous = libxml_use_internal_errors(true);
             $content = '<div>' . $content . '</div>';
-            $string = mb_convert_encoding($content, 'HTML-ENTITIES', 'UTF-8');
+            $string = mb_encode_numericentity(
+                $content,
+                ['HTML-ENTITIES','','',''],
+                'UTF-8'
+            );
             $dom->loadHTML($string, LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD);
         } catch (\Exception $e) {
             $this->loggerInterface->critical($e->getMessage());