Skip to content

Commit

Permalink
Merge branch '5.4' into 6.0
Browse files Browse the repository at this point in the history
* 5.4:
  Fix merge
  [HttpKernel] Guard against bad profile data
  Fix deprecations on PHP 8.2
  • Loading branch information
nicolas-grekas committed Mar 2, 2022
2 parents e69501c + a7ca9fd commit f6639cb
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion PseudoLocalizationTranslator.php
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ private function getParts(string $originalTrans): array
return [[true, true, $originalTrans]];
}

$html = mb_convert_encoding($originalTrans, 'HTML-ENTITIES', mb_detect_encoding($originalTrans, null, true) ?: 'UTF-8');
$html = mb_encode_numericentity($originalTrans, [0x80, 0xFFFF, 0, 0xFFFF], mb_detect_encoding($originalTrans, null, true) ?: 'UTF-8');

$useInternalErrors = libxml_use_internal_errors(true);

Expand Down

0 comments on commit f6639cb

Please sign in to comment.