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

Timestamp:

09/27/2024 12:42:47 AM (18 months ago)

Author:

dmsnell

Message:

HTML API: Switch to HTML namespace when entering Integration Points.

When encountering inline SVG and MathML content in an HTML document, there are certain "integration points" which transition back into the HTML parsing ruleset. Previously, the HTML API was incorrectly switching into the namespace of the element transitioning into that ruleset.

In this patch, the correct transition is made, where all integration points refer to HTML rules, while non-integration points refer to the rules of the namespace corresponding to the token itself.

Developed in ​https://github.com/wordpress/wordpress-develop/pull/7425
Discussed in https://core.trac.wordpress.org/ticket/61576

Props dmsnell, jonsurrell.
See #61576.

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

@@ -394 +394 @@
                 $this->element_queue[] = new WP_HTML_Stack_Event( $token, WP_HTML_Stack_Event::PUSH, $provenance );
 
-                $this->change_parsing_namespace( $token->namespace );
+                $this->change_parsing_namespace( $token->integration_node_type ? 'html' : $token->namespace );
             }
         );
@@ -404 +404 @@
                 $provenance            = ( ! $same_node || $is_virtual ) ? 'virtual' : 'real';
                 $this->element_queue[] = new WP_HTML_Stack_Event( $token, WP_HTML_Stack_Event::POP, $provenance );
+
                 $adjusted_current_node = $this->get_adjusted_current_node();
-                $this->change_parsing_namespace(
-                    $adjusted_current_node
-                        ? $adjusted_current_node->namespace
-                        : 'html'
-                );
+
+                if ( $adjusted_current_node ) {
+                    $this->change_parsing_namespace( $adjusted_current_node->integration_node_type ? 'html' : $adjusted_current_node->namespace );
+                } else {
+                    $this->change_parsing_namespace( 'html' );
+                }
             }
         );