Changeset 58590 for branches/6.6/src/wp-includes/html-api/class-wp-html-open-elements.php

Timestamp:

06/28/2024 07:11:25 AM (2 years ago)

Author:

gziolo

Message:

HTML API: Report breadcrumbs properly when visiting virtual nodes.

The breadcrumbs have been updated to account for the virtual nodes
and the depth method has been updated to rely on the fixed breadcrumb logic.

Reviewed by jonsurrell, zieladam, gziolo.
Merges [58588] to the 6.6 branch.

Follow-up to [58304].

Props dmsnell, hellofromtonya, joemcgill, jonsurrell, zieladam.
Fixes #61348.

Location:

branches/6.6

Files:

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

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

@@ -309 +309 @@
         public function pop() {
                 $item = array_pop( $this->stack );
-
                 if ( null === $item ) {
                         return false;
                 }
 
+                if ( 'context-node' === $item->bookmark_name ) {
+                        $this->stack[] = $item;
+                        return false;
+                }
+
                 $this->after_element_pop( $item );
                 return true;
@@ -330 +334 @@
         public function pop_until( $tag_name ) {
                 foreach ( $this->walk_up() as $item ) {
+                        if ( 'context-node' === $item->bookmark_name ) {
+                                return true;
+                        }
+
                         $this->pop();
 
@@ -370 +378 @@
          */
         public function remove_node( $token ) {
+                if ( 'context-node' === $token->bookmark_name ) {
+                        return false;
+                }
+
                 foreach ( $this->walk_up() as $position_from_end => $item ) {
                         if ( $token->bookmark_name !== $item->bookmark_name ) {