Merge remote-tracking branch 'origin/AC-7737' into Hammer_Regression_Blocker_Encoding_decodings_19jan22

glo71317 · glo71317 · commit f2ac7d937a49 · 2023-01-19T20:42:55.000+05:30
diff --git a/app/code/Magento/Sales/Helper/Admin.php b/app/code/Magento/Sales/Helper/Admin.php
@@ -197,8 +197,17 @@ public function escapeHtmlWithLinks($data, $allowedTags = null)
                     }
                 }
             }
-            // phpcs:ignore Magento2.Functions.DiscouragedFunction
-            $result = html_entity_decode($domDocument->saveHTML(), ENT_QUOTES, 'UTF-8');
+
+            $result = mb_decode_numericentity(
+                // phpcs:ignore Magento2.Functions.DiscouragedFunction
+                html_entity_decode(
+                    $domDocument->saveHTML(),
+                    ENT_QUOTES|ENT_SUBSTITUTE,
+                    'UTF-8'
+                ),
+                $convmap,
+                '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
@@ -119,7 +119,16 @@ function ($errorNumber, $errorString) {
                 $this->escapeText($domDocument);
                 $this->escapeAttributeValues($domDocument);
 
-                $result = html_entity_decode($domDocument->saveHTML(), ENT_QUOTES, 'UTF-8');
+                $result = mb_decode_numericentity(
+                // phpcs:ignore Magento2.Functions.DiscouragedFunction
+                    html_entity_decode(
+                        $domDocument->saveHTML(),
+                        ENT_QUOTES|ENT_SUBSTITUTE,
+                        'UTF-8'
+                    ),
+                    $convmap,
+                    'UTF-8'
+                );
 
                 preg_match('/<body id="' . $wrapperElementId . '">(.+)<\/body><\/html>$/si', $result, $matches);
                 return !empty($matches) ? $matches[1] : '';
diff --git a/lib/internal/Magento/Framework/Test/Unit/EscaperTest.php b/lib/internal/Magento/Framework/Test/Unit/EscaperTest.php
@@ -328,6 +328,11 @@ public function escapeHtmlDataProvider()
                 'expected' => ' some text',
                 'allowedTags' => ['span'],
             ],
+            'text with japanese lang' => [
+                'data' => '<span>だ だ だ some text in tags<br /></span>',
+                'expected' => '<span>だ だ だ some text in tags</span>',
+                'allowedTags' => ['span'],
+            ],
         ];
     }
 

Original file line number	Diff line number	Diff line change
`@@ -197,8 +197,17 @@ public function escapeHtmlWithLinks($data, $allowedTags = null)`
`197`	`197`	`}`
`198`	`198`	`}`
`199`	`199`	`}`
`200`		`- // phpcs:ignore Magento2.Functions.DiscouragedFunction`
`201`		`- $result = html_entity_decode($domDocument->saveHTML(), ENT_QUOTES, 'UTF-8');`
	`200`	`+`
	`201`	`+ $result = mb_decode_numericentity(`
	`202`	`+ // phpcs:ignore Magento2.Functions.DiscouragedFunction`
	`203`	`+ html_entity_decode(`
	`204`	`+ $domDocument->saveHTML(),`
	`205`	`+ ENT_QUOTES\|ENT_SUBSTITUTE,`
	`206`	`+ 'UTF-8'`
	`207`	`+ ),`
	`208`	`+ $convmap,`
	`209`	`+ 'UTF-8'`
	`210`	`+ );`
`202`	`211`
`203`	`212`	`preg_match('/<body id="' . $wrapperElementId . '">(.+)<\/body><\/html>$/si', $result, $matches);`
`204`	`213`	`$data = !empty($matches) ? $matches[1] : '';`