Skip to content

Commit 2aab7c1

Browse files
Merge branch '3.4' into 4.4
* 3.4: [Yaml] fix dumping strings containing CRs [DI] Fix XmlFileLoader bad error message Tweak message improve PlaintextPasswordEncoder docBlock summary [Validator] Add two missing translations for the Arabic (ar) locale Use some PHP 5.4 constants unconditionally Revert "bug symfony#28179 [DomCrawler] Skip disabled fields processing in Form" Add Spanish translation Fix typo [Validator] add Japanese translation Fix typo Add Polish translation [SecurityBundle] Minor fixes in configuration tree builder bumped Symfony version to 3.4.39 updated VERSION for 3.4.38 update CONTRIBUTORS for 3.4.38 updated CHANGELOG for 3.4.38
2 parents 677927d + 169ee10 commit 2aab7c1

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

FormRenderer.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -293,9 +293,9 @@ public function humanize($text)
293293
public function encodeCurrency(Environment $environment, string $text, string $widget = ''): string
294294
{
295295
if ('UTF-8' === $charset = $environment->getCharset()) {
296-
$text = htmlspecialchars($text, ENT_QUOTES | (\defined('ENT_SUBSTITUTE') ? ENT_SUBSTITUTE : 0), 'UTF-8');
296+
$text = htmlspecialchars($text, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8');
297297
} else {
298-
$text = htmlentities($text, ENT_QUOTES | (\defined('ENT_SUBSTITUTE') ? ENT_SUBSTITUTE : 0), 'UTF-8');
298+
$text = htmlentities($text, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8');
299299
$text = iconv('UTF-8', $charset, $text);
300300
$widget = iconv('UTF-8', $charset, $widget);
301301
}

0 commit comments

Comments
 (0)