Skip to content
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

Update PHP “parser” to recognize shorthand block syntax #1190

Merged
merged 3 commits into from
Jun 17, 2017
Merged

Update PHP “parser” to recognize shorthand block syntax #1190

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0d15a36
Update PHP parser to recognize shorthand block syntax
westonruter Jun 15, 2017
0bf98a8
Improve naming of matcher variable
westonruter Jun 17, 2017
578b386
Remove unused variable
westonruter Jun 17, 2017
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
2 changes: 1 addition & 1 deletion lib/blocks.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ function do_blocks( $content ) {
global $wp_registered_blocks;

// Extract the blocks from the post content.
$open_matcher = '/<!--\s*wp:([a-z](?:[a-z0-9\/]+)*)\s+((?:(?!-->).)*)-->.*?<!--\s*\/wp:\g1\s+-->/';
$open_matcher = '/<!--\s*wp:([a-z](?:[a-z0-9\/]+)*)\s+((?:(?!-->).)*)\s*\/?-->(?:.*?<!--\s*\/wp:\g1\s+-->)?/';
Copy link
Member

@aduth aduth Jun 15, 2017 •
edited
Loading

Choose a reason for hiding this comment

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

Should we rename this variable since it's not necessarily applying to openings only?

Also, this could match (or fail to match) some interesting variations: https://regex101.com/r/8hi4ds/2

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes, it can match or fail to match some variations but this is more due to the fundamental problem of there not being a proper grammar being implemented in PHP. For that see #1086 and #1152.

preg_match_all( $open_matcher, $content, $matches, PREG_OFFSET_CAPTURE );

$new_content = $content;
Expand Down