Port changes from core PR #26417
Merged
Port changes from core PR #26417
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
oandregal
requested review from
spacedmonkey and
TimothyBJacobs
as code owners
oandregal
added
the
[Type] Code Quality
|
Size Change: +459 B (0%) Total Size: 1.2 MB
ℹ️ View Unchanged
|
mcsf
approved these changes
Oct 23, 2020
| WP_Block_Supports::$block_to_render = $parent_block; | ||
| return $result; | ||
| } else { | ||
| return $block_render_callback( $attributes, $content ); |
There was a problem hiding this comment.
Minor stylistic point: I'd prefer the early-return method (which we tend to prefer in JS too) over the if-else pair. And that way we also avoid double negatives like !== null:
if ( null === $block ) {
return $block_render_callback( $attributes, $content );
}
$parent_block = …
There was a problem hiding this comment.
Extra advantage for early-return – now the main logic branch is at the top execution level and the error handling is an obvious detail at a deeper level.
P.S. Sorry for the drive-by comment… :)
There was a problem hiding this comment.
@nb: I still remember Else considered harmful. ;)
sirreal
reviewed
Oct 23, 2020
Co-authored-by: Jon Surrell <jon.surrell@automattic.com>
|
I want to coordinate changes from this PR WordPress/wordpress-develop#640 before merging this one. |
|
WordPress/wordpress-develop#640 was merged so I'm landing this one as well. Note that there's a failing end-to-end test. This is because CI is using latest wordpress-develop, so it'll be fixed as soon as it picks up the new patched version. |
oandregal
pushed a commit
that referenced
this pull request
Oct 26, 2020
…ss (#26417) This PR ports the changes from the core PR at WordPress/wordpress-develop#640 Co-authored-by: Jon Surrell <jon.surrell@automattic.com> Co-authored-by: Miguel Fonseca <miguelcsf@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR ports the changes done while preparing the block supports class to be ported to core. See WordPress/wordpress-develop#640
Specifically, this adds the following checks:
nullWP_Block. This is because there are some dead paths in core that are still used by tests, so we need to cover against that as well. See this comment for context.How to test
wp-block-social-linksis attached to the root element (ul) and not the children (li).