diff vendor/masterminds/html5/src/HTML5.php @ 5:12f9dff5fda9 tip

Update to Drupal core 8.7.1
author Chris Cannam
date Thu, 09 May 2019 15:34:47 +0100
parents a9cd425dd02b
children
line wrap: on
line diff
--- a/vendor/masterminds/html5/src/HTML5.php	Thu Feb 28 13:11:55 2019 +0000
+++ b/vendor/masterminds/html5/src/HTML5.php	Thu May 09 15:34:47 2019 +0100
@@ -155,7 +155,7 @@
         $this->errors = array();
         $options = array_merge($this->defaultOptions, $options);
         $events = new DOMTreeBuilder(false, $options);
-        $scanner = new Scanner($input);
+        $scanner = new Scanner($input, !empty($options['encoding']) ? $options['encoding'] : 'UTF-8');
         $parser = new Tokenizer($scanner, $events, !empty($options['xmlNamespaces']) ? Tokenizer::CONFORMANT_XML : Tokenizer::CONFORMANT_HTML);
 
         $parser->parse();
@@ -179,7 +179,7 @@
     {
         $options = array_merge($this->defaultOptions, $options);
         $events = new DOMTreeBuilder(true, $options);
-        $scanner = new Scanner($input);
+        $scanner = new Scanner($input, !empty($options['encoding']) ? $options['encoding'] : 'UTF-8');
         $parser = new Tokenizer($scanner, $events, !empty($options['xmlNamespaces']) ? Tokenizer::CONFORMANT_XML : Tokenizer::CONFORMANT_HTML);
 
         $parser->parse();