Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-01-22 16:21:26 +01:00
Code Issues Projects Releases Wiki Activity

Interactivity API: Skip instead of bail out if HTML contains SVG or MATH.

Browse Source 
Addresses an issue with server-side processing of directives when there is e.g. an SVG icon a navigation menu.

Props cbravobernal, westonruter, dmsnell, swissspidy.
Fixes #60517.
Built from https://develop.svn.wordpress.org/trunk@57649


git-svn-id: http://core.svn.wordpress.org/trunk@57150 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Pascal Birchler 2024-02-17 15:28:04 +00:00
parent f97698702d
commit 41532d5638
3 changed files with 41 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
wp-includes/interactivity-api/class-wp-interactivity-api-directives-processor.php
View File

@ -180,6 +180,39 @@ final class WP_Interactivity_API_Directives_Processor extends WP_HTML_Tag_Proces
return array( $opener_tag, $closer_tag ); return array( $opener_tag, $closer_tag );
} }
/**
* Skips processing the content between tags.
*
* It positions the cursor in the closer tag of the foreign element, if it
* exists.
*
* This function is intended to skip processing SVG and MathML inner content
* instead of bailing out the whole processing.
*
* @since 6.5.0
*
* @access private
*
* @return bool Whether the foreign content was successfully skipped.
*/
public function skip_to_tag_closer(): bool {
$depth = 1;
$tag_name = $this->get_tag();
while ( $depth > 0 && $this->next_tag(
array(
'tag_name' => $tag_name,
'tag_closers' => 'visit',
)
) ) {
if ( $this->has_self_closing_flag() ) {
continue;
}
$depth += $this->is_tag_closer() ? -1 : 1;
}
return 0 === $depth;
}
/** /**
* Finds the matching closing tag for an opening tag. * Finds the matching closing tag for an opening tag.
* *

9
wp-includes/interactivity-api/class-wp-interactivity-api.php
View File

@ -235,9 +235,14 @@ final class WP_Interactivity_API {
while ( $p->next_tag( array( 'tag_closers' => 'visit' ) ) ) { while ( $p->next_tag( array( 'tag_closers' => 'visit' ) ) ) {
$tag_name = $p->get_tag(); $tag_name = $p->get_tag();
/*
* Directives inside SVG and MATH tags are not processed,
* as they are not compatible with the Tag Processor yet.
* We still process the rest of the HTML.
*/
if ( 'SVG' === $tag_name || 'MATH' === $tag_name ) { if ( 'SVG' === $tag_name || 'MATH' === $tag_name ) {
$unbalanced = true; $p->skip_to_tag_closer();
break; continue;
} }
if ( $p->is_tag_closer() ) { if ( $p->is_tag_closer() ) {

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '6.5-beta1-57648'; $wp_version = '6.5-beta1-57649';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.