Changeset 61530 for branches/6.9/src/wp-includes/class-wp-block-processor.php

Timestamp:

01/26/2026 04:28:52 PM (4 months ago)

Author:

jonsurrell

Message:

Blocks: Ensure extract_full_block_and_advance() matches parse_blocks()

The behavior of WP_Block_Processor::extract_full_block_and_advance() should produce an identical output to what parse_blocks() would return on the same substring of input.

Unfortunately, when HTML spans followed inner blocks, they were being omitted in the output parse tree. This was due to an omission in the original code which would look for those blocks before advancing again after calling extract_full_block_and_advance() recursively.

This patch adds the missing check and resolves the discrepancy.

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

Follow-up to [60939].

Reviewed by jonsurrell.
Merges [61509] to the 6.9 branch.

Props dmsnell, jonsurrell, jorbin.
Fixes #64537.

Location:

branches/6.9

Files:

• . (modified) (1 prop)
• src/wp-includes/class-wp-block-processor.php (modified) (1 diff)

branches/6.9/src/wp-includes/class-wp-block-processor.php

@@ -1296 +1296 @@
                 $block['innerContent'][] = null;
             }
+
+            /*
+             * Because the parser has advanced past the closing block token, it
+             * may be matched on an HTML span. This needs to be processed before
+             * moving on to the next token at the start of the next loop iteration.
+             */
+            if ( $this->is_html() ) {
+                $chunk                   = $this->get_html_content();
+                $block['innerHTML']     .= $chunk;
+                $block['innerContent'][] = $chunk;
+            }
         }