Changeset 59411 for branches/6.7/src/wp-includes/html-api/class-wp-html-processor.php

Timestamp:

11/18/2024 01:37:52 PM (13 months ago)

Author:

cbravobernal

Message:

HTML API: Fix normalized doctype pub/sys identifier quotes.

Changeset [59399] fixed missing DOCTYPEs in normalized HTML output. It missed an edge case where public and system identifiers may contain double quotes, in which case they must be quoted with single quotes.

This commit addresses that issue and adds tests.

Follow-up to [59399].

Reviewed by cbravobernal.
Merges [59410] to the 6.7 branch.

Props jonsurrell, luisherranz, apermo.
Fixes #62396.

Location:

branches/6.7

Files:

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

branches/6.7/src/wp-includes/html-api/class-wp-html-processor.php

@@ -1171 +1171 @@
 
                 if ( null !== $doctype->public_identifier ) {
-                    $html .= " PUBLIC \"{$doctype->public_identifier}\"";
+                    $quote = str_contains( $doctype->public_identifier, '"' ) ? "'" : '"';
+                    $html .= " PUBLIC {$quote}{$doctype->public_identifier}{$quote}";
                 }
                 if ( null !== $doctype->system_identifier ) {
@@ -1177 +1178 @@
                         $html .= ' SYSTEM';
                     }
-                    $html .= " \"{$doctype->system_identifier}\"";
-                }
+                    $quote = str_contains( $doctype->system_identifier, '"' ) ? "'" : '"';
+                    $html .= " {$quote}{$doctype->system_identifier}{$quote}";
+                }
+
                 $html .= '>';
                 break;