Skip to content

Blocks/refactor twentytwentyone block processor (take 2) #10291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dmsnell wants to merge 11 commits into
base: trunk
Choose a base branch
from
Open

Blocks/refactor twentytwentyone block processor (take 2) #10291

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e9f0d8a
Refactor twentwentyone to use Block_Processor
dmsnell Aug 13, 2025
67b1cf7
Re-introduce legacy function for environments pre-6.9.0.
dmsnell Jan 7, 2026
9015395
Adjust Block Processor logic to only scan top-level blocks.
dmsnell Jan 7, 2026
9d100de
Recombine separate functions, harmonize logic.
dmsnell Jan 7, 2026
35019d2
The freeform-check is redundant, already handled by the matching logic.
dmsnell Jan 7, 2026
99968c4
Remove `str_starts_with()` and fix precedence defect.
dmsnell Jan 13, 2026
52e0dd3
Revert legacy code changes, bring back str_starts_with
dmsnell Jan 13, 2026
3216ca1
Minimize diff by undoing unnecessary change
dmsnell Jan 13, 2026
26aebaa
Undo rename
dmsnell Jan 13, 2026
cfbff7f
wawawawa WPCS so much extra work
dmsnell Jan 13, 2026
737b12f
By reusing match-text/prefix PHP can release $block_name earlier.
dmsnell Jan 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
The freeform-check is redundant, already handled by the matching logic.
  • Loading branch information
@dmsnell
dmsnell committed Jan 7, 2026
commit 35019d2c8b3c1a6500f1905a82a071f21edcc0d6
7 changes: 1 addition & 6 deletions src/wp-content/themes/twentytwentyone/inc/template-functions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,15 +397,10 @@ function twenty_twenty_one_print_first_instance_of_block( $block_name, $content

// Loop top-level blocks, releasing them from memory as soon as possible.
while ( $instance_count < $instances && null !== ( $block = array_shift( $blocks ) ) ) {
// Skip inter-block whitespace and other freeform non-block HTML.
if ( ! isset( $block['blockName'] ) ) {
continue;
}

if (
$match_fully
? $block_name === $block['blockName']
: str_starts_with( $block['blockName'], $prefix )
: str_starts_with( $block['blockName'] ?? '', $prefix )
Copy link

@sabernhardt sabernhardt Jan 12, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

str_starts_with theoretically could be a problem in the legacy fallback if the site runs:

(I do not recommend editing the legacy code because then you need to test it with legacy systems.)

Any site that supports WP_Block_Processor should support str_starts_with too.

Copy link
Member Author

@dmsnell dmsnell Jan 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in 99968c4 I removed str_starts_with() because it’s easy enough to avoid it. theoretically it would be possible that someone manually adds the WP_Block_Processor class on an old install without it.

in the process I discovered a bug I had overlooked with precedence in the conditional. this has been resolved by splitting the conditional into two.

Copy link
Member Author

@dmsnell dmsnell Jan 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and in 52e0dd3 I added it back, but added the feature gate. after undoing the legacy changes it didn’t seem as important to keep things coherent between them. I also misunderstood your comment initially because I overlooked that I introduced str_starts_with() in the legacy updates.

) {
$blocks_content .= render_block( $block );
++$instance_count;
Expand Down
Loading