Skip to content

Commit bf704b7

Browse files
Merge branch '5.4' into 6.0
* 5.4: expand uninitialized session tests [Lock] Release PostgreSqlStore connection lock on failure [DomCrawler] Fix HTML5 parser charset option cs fix [HttpKernel] Do not attempt to register enum arguments in controller service locator [Mime] Fix missing sprintf in DkimSigner [Translation] [LocoProvider] Use rawurlencode and separate tag setting [Security] fix unserializing session payloads from v4 [Cache] Don't lock when doing nested computations [Messenger] fix Redis support on 32b arch [HttpFoundation] Fix notice when HTTP_PHP_AUTH_USER passed without pass [Security] Add getting started example to README
2 parents c95b4ad + bb3bc36 commit bf704b7

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Crawler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1053,7 +1053,7 @@ protected function sibling(\DOMNode $node, string $siblingDir = 'nextSibling'):
10531053

10541054
private function parseHtml5(string $htmlContent, string $charset = 'UTF-8'): \DOMDocument
10551055
{
1056-
return $this->html5Parser->parse($this->convertToHtmlEntities($htmlContent, $charset), [], $charset);
1056+
return $this->html5Parser->parse($this->convertToHtmlEntities($htmlContent, $charset));
10571057
}
10581058

10591059
private function parseXhtml(string $htmlContent, string $charset = 'UTF-8'): \DOMDocument

0 commit comments

Comments
 (0)