From: gggeek <giunta.gaetano@gmail.com>
Date: Mon, 23 Jan 2023 16:14:19 +0000 (+0000)
Subject: avoid breaking xml in one case of fault in mb_convert_encoding
X-Git-Tag: 4.10.0~99
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=1b6a01410e10f689d37749b0cfca4c787e1747c0;p=plcapi.git

avoid breaking xml in one case of fault in mb_convert_encoding
---

diff --git a/src/Helper/Charset.php b/src/Helper/Charset.php
index 73965756..df3a8593 100644
--- a/src/Helper/Charset.php
+++ b/src/Helper/Charset.php
@@ -308,7 +308,7 @@ class Charset
                         $data = htmlspecialchars($data,  defined('ENT_XML1') ? ENT_XML1 | ENT_QUOTES : ENT_QUOTES, 'UTF-8');
                     }
                     if ($srcEncoding !== $destEncoding) {
-                        $data = mb_convert_encoding($data, str_replace('US-ASCII', 'ASCII', $destEncoding), str_replace('US-ASCII', 'ASCII', $srcEncoding));
+                        $data = @mb_convert_encoding($data, str_replace('US-ASCII', 'ASCII', $destEncoding), str_replace('US-ASCII', 'ASCII', $srcEncoding));
                     }
                     if ($data === false) {
                         $escapedData = '';