Skip to content

HTML API: Treat empty system IDs as missing for doctype quirks. #12382

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sirreal wants to merge 7 commits into from
+10 −11
Closed

HTML API: Treat empty system IDs as missing for doctype quirks. #12382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
05273b6
HTML API: Treat empty system IDs as missing for doctype quirks.
sirreal Jul 1, 2026
aabc723
Remove redundant variable
sirreal Jul 1, 2026
1c57006
revert changes
sirreal Jul 1, 2026
dd6dd2e
Udpate tests
sirreal Jul 1, 2026
510b0ae
Merge branch 'trunk' into trac-12084-update-doctype-parsing
sirreal Jul 1, 2026
6a6ba98
Merge branch 'trunk' into trac-12084-update-doctype-parsing
sirreal Jul 6, 2026
5955b7c
Merge branch 'trunk' into trac-12084-update-doctype-parsing
sirreal Jul 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions src/wp-includes/html-api/class-wp-html-doctype-info.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,13 +229,9 @@ private function __construct(
* >
* > The system identifier and public identifier strings must be compared...
* > in an ASCII case-insensitive manner.
* >
* > A system identifier whose value is the empty string is not considered missing
* > for the purposes of the conditions above.
*/
$system_identifier_is_missing = null === $system_identifier;
$public_identifier = null === $public_identifier ? '' : strtolower( $public_identifier );
$system_identifier = null === $system_identifier ? '' : strtolower( $system_identifier );
$public_identifier = null === $public_identifier ? '' : strtolower( $public_identifier );
$system_identifier = null === $system_identifier ? '' : strtolower( $system_identifier );

/*
* > The public identifier is set to…
Expand Down Expand Up @@ -335,10 +331,11 @@ private function __construct(
}

/*
* > The system identifier is missing and the public identifier starts with…
* > The system identifier is missing or the empty string, and the
* > public identifier starts with…
*/
if (
$system_identifier_is_missing && (
'' === $system_identifier && (
str_starts_with( $public_identifier, '-//w3c//dtd html 4.01 frameset//' ) ||
str_starts_with( $public_identifier, '-//w3c//dtd html 4.01 transitional//' )
)
Expand All @@ -364,10 +361,11 @@ private function __construct(
}

/*
* > The system identifier is not missing and the public identifier starts with…
* > The system identifier is neither missing nor the empty string, and the
* > public identifier starts with…
*/
if (
! $system_identifier_is_missing && (
'' !== $system_identifier && (
str_starts_with( $public_identifier, '-//w3c//dtd html 4.01 frameset//' ) ||
str_starts_with( $public_identifier, '-//w3c//dtd html 4.01 transitional//' )
)
Expand Down
3 changes: 2 additions & 1 deletion tests/phpunit/tests/html-api/wpHtmlDoctypeInfo.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,8 @@ public static function data_parseable_raw_doctypes(): array {
'Emoji' => array( '<!DOCTYPE 🏴󠁧󠁢󠁥󠁮󠁧󠁿 PUBLIC "🔥" "😈">', 'quirks', "\u{1F3F4}\u{E0067}\u{E0062}\u{E0065}\u{E006E}\u{E0067}\u{E007F}", '🔥', '😈' ),
'Bogus characters instead of SYSTEM quote after public' => array( "<!DOCTYPE html PUBLIC ''x''>", 'quirks', 'html', '' ),
'Special quirks mode if system unset' => array( '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Frameset//">', 'quirks', 'html', '-//W3C//DTD HTML 4.01 Frameset//' ),
'Special limited-quirks mode if system set' => array( '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Frameset//" "">', 'limited-quirks', 'html', '-//W3C//DTD HTML 4.01 Frameset//', '' ),
'Special quirks mode if system empty' => array( '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Frameset//" "">', 'quirks', 'html', '-//W3C//DTD HTML 4.01 Frameset//', '' ),
'Special limited-quirks mode if system is non-empty' => array( '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Frameset//" "non-empty">', 'limited-quirks', 'html', '-//W3C//DTD HTML 4.01 Frameset//', 'non-empty' ),
);
}

Expand Down
Loading