PHP Encoding Issue Check

glo17680 · glo17680 · commit 96f46306ebce · 2023-01-18T18:51:03.000+05:30
diff --git a/app/code/Magento/Sales/Helper/Admin.php b/app/code/Magento/Sales/Helper/Admin.php
@@ -166,7 +166,7 @@ public function escapeHtmlWithLinks($data, $allowedTags = null)
 
             $internalErrors = libxml_use_internal_errors(true);
 
-            $data = mb_convert_encoding($data, 'HTML-ENTITIES', 'UTF-8');
+//            $data = mb_convert_encoding($data, 'HTML-ENTITIES', 'UTF-8');
             $domDocument->loadHTML(
                 '<html><body id="' . $wrapperElementId . '">' . $data . '</body></html>'
             );
@@ -192,7 +192,9 @@ public function escapeHtmlWithLinks($data, $allowedTags = null)
                 }
             }
 
-            $result = mb_convert_encoding($domDocument->saveHTML(), 'UTF-8', 'HTML-ENTITIES');
+//            $result = mb_convert_encoding($domDocument->saveHTML(), 'UTF-8', 'HTML-ENTITIES');
+            $result = html_entity_decode($domDocument->saveHTML(), ENT_QUOTES, 'UTF-8');
+
             preg_match('/<body id="' . $wrapperElementId . '">(.+)<\/body><\/html>$/si', $result, $matches);
             $data = !empty($matches) ? $matches[1] : '';
         }
diff --git a/lib/internal/Magento/Framework/Escaper.php b/lib/internal/Magento/Framework/Escaper.php
@@ -97,7 +97,7 @@ function ($errorNumber, $errorString) {
                     }
                 );
                 $data = $this->prepareUnescapedCharacters($data);
-                $string = mb_convert_encoding($data, 'HTML-ENTITIES', 'UTF-8');
+                $string = $data; //mb_convert_encoding($data, 'HTML-ENTITIES', 'UTF-8');
                 try {
                     $domDocument->loadHTML(
                         '<html><body id="' . $wrapperElementId . '">' . $string . '</body></html>'
@@ -114,7 +114,9 @@ function ($errorNumber, $errorString) {
                 $this->escapeText($domDocument);
                 $this->escapeAttributeValues($domDocument);
 
-                $result = mb_convert_encoding($domDocument->saveHTML(), 'UTF-8', 'HTML-ENTITIES');
+//                $result = mb_convert_encoding($domDocument->saveHTML(), 'UTF-8', 'HTML-ENTITIES');
+                $result = html_entity_decode($domDocument->saveHTML(), ENT_QUOTES, 'UTF-8');
+
                 preg_match('/<body id="' . $wrapperElementId . '">(.+)<\/body><\/html>$/si', $result, $matches);
                 return !empty($matches) ? $matches[1] : '';
             } else {

Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ public function escapeHtmlWithLinks($data, $allowedTags = null)`
`166`	`166`
`167`	`167`	`$internalErrors = libxml_use_internal_errors(true);`
`168`	`168`
`169`		`- $data = mb_convert_encoding($data, 'HTML-ENTITIES', 'UTF-8');`
	`169`	`+// $data = mb_convert_encoding($data, 'HTML-ENTITIES', 'UTF-8');`
`170`	`170`	`$domDocument->loadHTML(`
`171`	`171`	`'<html><body id="' . $wrapperElementId . '">' . $data . '</body></html>'`
`172`	`172`	`);`
`@@ -192,7 +192,9 @@ public function escapeHtmlWithLinks($data, $allowedTags = null)`
`192`	`192`	`}`
`193`	`193`	`}`
`194`	`194`
`195`		`- $result = mb_convert_encoding($domDocument->saveHTML(), 'UTF-8', 'HTML-ENTITIES');`
	`195`	`+// $result = mb_convert_encoding($domDocument->saveHTML(), 'UTF-8', 'HTML-ENTITIES');`
	`196`	`+ $result = html_entity_decode($domDocument->saveHTML(), ENT_QUOTES, 'UTF-8');`
	`197`	`+`
`196`	`198`	`preg_match('/<body id="' . $wrapperElementId . '">(.+)<\/body><\/html>$/si', $result, $matches);`
`197`	`199`	`$data = !empty($matches) ? $matches[1] : '';`
`198`	`200`	`}`