Changeset 60983

Timestamp:

10/20/2025 09:11:46 AM (5 weeks ago)

Author:

Bernhard Reiter

Message:

Block Bindings: Polish rich-text attribute replacement code.

In the Block Bindings code introduced to replace rich-text attributes, address feedback to:

• reuse an existing bookmark (instead of releasing it), and to
• verify that the expected matching tag closer was found.

Follow-up to [60684].
Props bernhard-reiter, dmsnell.
See #63840.

File:

• trunk/src/wp-includes/class-wp-block.php (modified) (2 diffs)

trunk/src/wp-includes/class-wp-block.php

@@ -445 +445 @@
                 }
 
-                $depth = $this->get_current_depth();
-
-                $this->set_bookmark( '_wp_block_bindings_tag_opener' );
+                $depth    = $this->get_current_depth();
+                $tag_name = $this->get_tag();
+
+                $this->set_bookmark( '_wp_block_bindings' );
                 // The bookmark names are prefixed with `_` so the key below has an extra `_`.
-                $tag_opener = $this->bookmarks['__wp_block_bindings_tag_opener'];
+                $tag_opener = $this->bookmarks['__wp_block_bindings'];
                 $start      = $tag_opener->start + $tag_opener->length;
-                $this->release_bookmark( '_wp_block_bindings_tag_opener' );
 
                 // Find matching tag closer.
@@ -457 +457 @@
                 }
 
-                $this->set_bookmark( '_wp_block_bindings_tag_closer' );
-                $tag_closer = $this->bookmarks['__wp_block_bindings_tag_closer'];
+                if ( ! $this->is_tag_closer() || $tag_name !== $this->get_tag() ) {
+                    return false;
+                }
+
+                $this->set_bookmark( '_wp_block_bindings' );
+                $tag_closer = $this->bookmarks['__wp_block_bindings'];
                 $end        = $tag_closer->start;
-                $this->release_bookmark( '_wp_block_bindings_tag_closer' );
 
                 $this->lexical_updates[] = new WP_HTML_Text_Replacement(