Changeset 58992 for trunk/src/wp-includes/html-api/class-wp-html-open-elements.php

Timestamp:

09/04/2024 07:23:48 PM (16 months ago)

Author:

dmsnell

Message:

HTML API: Only examine HTML nodes in pop_until() instack of open elements.

The pop_until( $tag_name ) method in the stack of open elements should only be examining HTML elements, but it has only been checking the tag name. This has led to closing the wrong tags when run from inside foreign content. A very specific situation where this may arise is when a TEMPLATE closer is found inside foreign content, inside another template.

HTML:template   SVG:template                 HTML:/template
<template><svg><template><foreignObject><div></template><div>
╰──< this outer TEMPLATE is closed by this one >───╯

This patch constains the method to checking for elements matching the tag name which are in the HTML namespace so that the proper detection occurs.

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

Follow-up to [58867].

Props dmsnell, jonsurrell.
See #61576.

File:

• trunk/src/wp-includes/html-api/class-wp-html-open-elements.php (modified) (3 diffs)

trunk/src/wp-includes/html-api/class-wp-html-open-elements.php

@@ -531 +531 @@
 
     /**
-     * Pops nodes off of the stack of open elements until one with the given tag name has been popped.
+     * Pops nodes off of the stack of open elements until an HTML tag with the given name has been popped.
      *
      * @since 6.4.0
@@ -537 +537 @@
      * @see WP_HTML_Open_Elements::pop
      *
-     * @param string $tag_name Name of tag that needs to be popped off of the stack of open elements.
+     * @param string $html_tag_name Name of tag that needs to be popped off of the stack of open elements.
      * @return bool Whether a tag of the given name was found and popped off of the stack of open elements.
      */
-    public function pop_until( string $tag_name ): bool {
+    public function pop_until( string $html_tag_name ): bool {
         foreach ( $this->walk_up() as $item ) {
-            if ( 'context-node' === $item->bookmark_name ) {
-                return true;
-            }
-
             $this->pop();
 
+            if ( 'html' !== $item->namespace ) {
+                continue;
+            }
+
             if (
-                '(internal: H1 through H6 - do not use)' === $tag_name &&
+                '(internal: H1 through H6 - do not use)' === $html_tag_name &&
                 in_array( $item->node_name, array( 'H1', 'H2', 'H3', 'H4', 'H5', 'H6' ), true )
             ) {
@@ -555 +555 @@
             }
 
-            if ( $tag_name === $item->node_name ) {
+            if ( $html_tag_name === $item->node_name ) {
                 return true;
             }