Merge pull request #367 from magento-obsessive-owls/PB-252

omiroshnichenko · web-flow · commit b9851a8c363e · 2020-01-29T17:06:45.000-06:00
[Owls] Dynamic Block Renders Nothing in Admin if Top Row is Hidden
diff --git a/app/code/Magento/PageBuilder/Model/Stage/HtmlFilter.php b/app/code/Magento/PageBuilder/Model/Stage/HtmlFilter.php
@@ -44,6 +44,7 @@ public function filterHtml(string $content): string
         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');
             $dom->loadHTML($string, LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD);
         } catch (\Exception $e) {
@@ -82,6 +83,6 @@ public function filterHtml(string $content): string
             );
             $htmlContentType->nodeValue = htmlentities($innerHTML);
         }
-        return $dom->saveHTML();
+        return substr(trim($dom->saveHTML()), 5, -6);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ public function filterHtml(string $content): string`
`44`	`44`	`try {`
`45`	`45`	`//this code is required because of https://bugs.php.net/bug.php?id=60021`
`46`	`46`	`$previous = libxml_use_internal_errors(true);`
	`47`	`+ $content = '<div>' . $content . '</div>';`
`47`	`48`	`$string = mb_convert_encoding($content, 'HTML-ENTITIES', 'UTF-8');`
`48`	`49`	`$dom->loadHTML($string, LIBXML_HTML_NOIMPLIED \| LIBXML_HTML_NODEFDTD);`
`49`	`50`	`} catch (\Exception $e) {`
`@@ -82,6 +83,6 @@ public function filterHtml(string $content): string`
`82`	`83`	`);`
`83`	`84`	`$htmlContentType->nodeValue = htmlentities($innerHTML);`
`84`	`85`	`}`
`85`		`- return $dom->saveHTML();`
	`86`	`+ return substr(trim($dom->saveHTML()), 5, -6);`
`86`	`87`	`}`
`87`	`88`	`}`