Merge branch 'develop' into MC-41471

serhii-balko · web-flow · commit b366a447d335 · 2021-04-23T10:27:03.000+03:00
diff --git a/app/code/Magento/PageBuilder/Model/Filter/Template.php b/app/code/Magento/PageBuilder/Model/Filter/Template.php
@@ -173,8 +173,13 @@ function ($errorNumber, $errorString) {
         $string = mb_convert_encoding($html, 'HTML-ENTITIES', 'UTF-8');
         try {
             libxml_use_internal_errors(true);
+            // LIBXML_SCHEMA_CREATE option added according to this message
+            // https://stackoverflow.com/a/66473950/773018
+            // Its need to avoid bug described in maskScriptTags()
+            // https://bugs.php.net/bug.php?id=52012
             $domDocument->loadHTML(
-                '<html><body>' . $string . '</body></html>'
+                '<html><body>' . $string . '</body></html>',
+                LIBXML_SCHEMA_CREATE
             );
             libxml_clear_errors();
         } catch (Exception $e) {
