Update Html.php

oleibman · web-flow · commit 088ae3ca637e · 2025-05-30T20:19:19.000-07:00
diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
@@ -97,7 +97,7 @@ public static function addHtml($element, $html, $fullHTML = false, $preserveWhit
         }
 
         if (substr($html, 0, 2) === "\xfe\xff" || substr($html, 0, 2) === "\xff\xfe") {
-            $html = mb_convert_encoding($html, 'UTF-8', 'UTF-16');
+            $html = (string) mb_convert_encoding($html, 'UTF-8', 'UTF-16');
         }
         if (substr($html, 0, 3) === "\xEF\xBB\xBF") {
             $html = substr($html, 3);

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ public static function addHtml($element, $html, $fullHTML = false, $preserveWhit`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`if (substr($html, 0, 2) === "\xfe\xff" \|\| substr($html, 0, 2) === "\xff\xfe") {`
`100`		`- $html = mb_convert_encoding($html, 'UTF-8', 'UTF-16');`
	`100`	`+ $html = (string) mb_convert_encoding($html, 'UTF-8', 'UTF-16');`
`101`	`101`	`}`
`102`	`102`	`if (substr($html, 0, 3) === "\xEF\xBB\xBF") {`
`103`	`103`	`$html = substr($html, 3);`