Changeset 59399 for trunk/src/wp-includes/html-api/class-wp-html-processor.php

Timestamp:

11/13/2024 12:18:48 PM (2 years ago)

Author:

Bernhard Reiter

Message:

HTML API: Include doctype in full parser serialize.

Output DOCTYPE when calling WP_HTML_Processor::serialize on a full document that includes a DOCTYPE.

The DOCTYPE should be included in the serialized/normalized HTML output as it has an impact in how the document is handled, in particular whether the document should be handled in quirks or no-quirks mode.

This only affects the serialization of full parsers at this time because DOCTYPE tokens are currently ignored in all possible fragments. The omission of the DOCTYPE is subtle but can change the serialized document's quirks/no-quirks mode.

Props jonsurrell.
Fixes #62396.

File:

• trunk/src/wp-includes/html-api/class-wp-html-processor.php (modified) (2 diffs)

trunk/src/wp-includes/html-api/class-wp-html-processor.php

@@ -1179 +1179 @@
 
                 switch ( $token_type ) {
+                        case '#doctype':
+                                $doctype = $this->get_doctype_info();
+                                if ( null === $doctype ) {
+                                        break;
+                                }
+
+                                $html .= '<!DOCTYPE';
+
+                                if ( $doctype->name ) {
+                                        $html .= " {$doctype->name}";
+                                }
+
+                                if ( null !== $doctype->public_identifier ) {
+                                        $html .= " PUBLIC \"{$doctype->public_identifier}\"";
+                                }
+                                if ( null !== $doctype->system_identifier ) {
+                                        if ( null === $doctype->public_identifier ) {
+                                                $html .= ' SYSTEM';
+                                        }
+                                        $html .= " \"{$doctype->system_identifier}\"";
+                                }
+                                $html .= '>';
+                                break;
+
                         case '#text':
                                 $html .= htmlspecialchars( $this->get_modifiable_text(), ENT_QUOTES | ENT_SUBSTITUTE | ENT_HTML5, 'UTF-8' );
@@ -1194 +1218 @@
                         case '#cdata-section':
                                 $html .= "<![CDATA[{$this->get_modifiable_text()}]]>";
-                                break;
-
-                        case 'html':
-                                $html .= '<!DOCTYPE html>';
                                 break;
                 }