Further fix for encoding issues (on JSON->HTML this time), CREO-148

Adam McCann · Adam McCann · commit c95378204d9c · 2016-09-12T12:14:52.000+01:00
diff --git a/src/Components/EmbeddedComponent.php b/src/Components/EmbeddedComponent.php
@@ -72,7 +72,8 @@ protected function appendHtml(stdClass $json, DOMDocument $dom, DOMElement $figu
         // create a temporary document and load the plain html
         $tmpDoc = new DOMDocument;
         libxml_use_internal_errors(true); // for html5 tags
-        $tmpDoc->loadHTML("<html><body>$html</body></html>");
+        $tmpDoc->loadHTML('<?xml encoding="UTF-8"><html><body>$html</body></html>');
+        $tmpDoc->encoding = 'UTF-8';
         libxml_clear_errors();
 
         // import and attach the created nodes to the paragraph
diff --git a/src/Components/Formats.php b/src/Components/Formats.php
@@ -108,7 +108,8 @@ public function render()
 
         // create a temporary document and load the plain html
         $tmpDoc = new DOMDocument;
-        $tmpDoc->loadHTML('<html><body>' . $this->text . '</body></html>');
+        $tmpDoc->loadHTML('<?xml encoding="UTF-8"><html><body>' . $this->text . '</body></html>');
+        $tmpDoc->encoding = 'UTF-8';
 
         // import and attach the created nodes to the paragraph
         foreach ($tmpDoc->getElementsByTagName('body')->item(0)->childNodes as $node) {
diff --git a/src/Components/HTMLComponent.php b/src/Components/HTMLComponent.php
@@ -42,7 +42,8 @@ public function parse(stdClass $json, DOMDocument $dom, DOMElement $parentElemen
 
         // create a temporary document and load the plain html
         $tmpDoc = new DOMDocument;
-        $tmpDoc->loadHTML('<html><body>' . $json->html . '</body></html>');
+        $tmpDoc->loadHTML('<?xml encoding="UTF-8"><html><body>' . $json->html . '</body></html>');
+        $tmpDoc->encoding = 'UTF-8';
 
         // import and attach the created nodes to the paragraph
         foreach ($tmpDoc->getElementsByTagName('body')->item(0)->childNodes as $node) {
