mirror of
https://github.com/WordPress/WordPress.git
synced 2024-12-23 01:27:36 +01:00
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]. Props jonsurrell, luisherranz, apermo. Fixes #62396. Built from https://develop.svn.wordpress.org/trunk@59410 git-svn-id: http://core.svn.wordpress.org/trunk@58796 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
5a2559365d
commit
72a29cef78
@ -1191,14 +1191,17 @@ class WP_HTML_Processor extends WP_HTML_Tag_Processor {
|
||||
}
|
||||
|
||||
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 ) {
|
||||
if ( null === $doctype->public_identifier ) {
|
||||
$html .= ' SYSTEM';
|
||||
}
|
||||
$html .= " \"{$doctype->system_identifier}\"";
|
||||
$quote = str_contains( $doctype->system_identifier, '"' ) ? "'" : '"';
|
||||
$html .= " {$quote}{$doctype->system_identifier}{$quote}";
|
||||
}
|
||||
|
||||
$html .= '>';
|
||||
break;
|
||||
|
||||
|
@ -16,7 +16,7 @@
|
||||
*
|
||||
* @global string $wp_version
|
||||
*/
|
||||
$wp_version = '6.8-alpha-59409';
|
||||
$wp_version = '6.8-alpha-59410';
|
||||
|
||||
/**
|
||||
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
|
||||
|
Loading…
Reference in New Issue
Block a user