MC-3678: Master format containing HTML5 elements is broken when used in block

irenelagno · irenelagno · commit 510606f4b8e9 · 2018-08-13T14:29:45.000-05:00
diff --git a/app/code/Magento/PageBuilder/Model/Stage/Renderer/CmsStaticBlock.php b/app/code/Magento/PageBuilder/Model/Stage/Renderer/CmsStaticBlock.php
@@ -106,13 +106,13 @@ private function removeScriptTags(array $directiveResult): array
     {
         $dom = new \DOMDocument();
         try {
+            //this code is required because of https://bugs.php.net/bug.php?id=60021
+            $previous = libxml_use_internal_errors(true);
             $dom->loadHTML($directiveResult['content']);
         } catch (\Exception $e) {
             $this->loggerInterface->critical($e->getMessage());
-            return [
-                'error' => __('The block cannot be displayed because it contains errors.')
-            ];
         }
+        libxml_use_internal_errors($previous);
         foreach (iterator_to_array($dom->getElementsByTagName('script')) as $item) {
             $item->parentNode->removeChild($item);
         }

Original file line number	Diff line number	Diff line change
`@@ -106,13 +106,13 @@ private function removeScriptTags(array $directiveResult): array`
`106`	`106`	`{`
`107`	`107`	`$dom = new \DOMDocument();`
`108`	`108`	`try {`
	`109`	`+ //this code is required because of https://bugs.php.net/bug.php?id=60021`
	`110`	`+ $previous = libxml_use_internal_errors(true);`
`109`	`111`	`$dom->loadHTML($directiveResult['content']);`
`110`	`112`	`} catch (\Exception $e) {`
`111`	`113`	`$this->loggerInterface->critical($e->getMessage());`
`112`		`- return [`
`113`		`- 'error' => __('The block cannot be displayed because it contains errors.')`
`114`		`- ];`
`115`	`114`	`}`
	`115`	`+ libxml_use_internal_errors($previous);`
`116`	`116`	`foreach (iterator_to_array($dom->getElementsByTagName('script')) as $item) {`
`117`	`117`	`$item->parentNode->removeChild($item);`
`118`	`118`	`}`