Skip to content

Remove null coalescing operator from layout. #5302

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

Closed
tellthemachines wants to merge 3 commits into from
Closed

Remove null coalescing operator from layout. #5302

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
961965f
Remove null coalescing operator from layout.
tellthemachines Sep 26, 2023
8cc4a89
Update src/wp-includes/block-supports/layout.php
tellthemachines Sep 26, 2023
3a4f129
Update src/wp-includes/block-supports/layout.php
tellthemachines Sep 26, 2023
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
4 changes: 2 additions & 2 deletions src/wp-includes/block-supports/layout.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,7 @@ function wp_get_layout_style( $selector, $layout, $has_block_gap_support = false
function wp_render_layout_support_flag( $block_content, $block ) {
$block_type = WP_Block_Type_Registry::get_instance()->get_registered( $block['blockName'] );
$block_supports_layout = block_has_support( $block_type, 'layout', false ) || block_has_support( $block_type, '__experimentalLayout', false );
$layout_from_parent = $block['attrs']['style']['layout']['selfStretch'] ?? null;
$layout_from_parent = isset( $block['attrs']['style']['layout']['selfStretch'] ) ? $block['attrs']['style']['layout']['selfStretch'] : null;

if ( ! $block_supports_layout && ! $layout_from_parent ) {
return $block_content;
Expand Down Expand Up @@ -770,7 +770,7 @@ function wp_render_layout_support_flag( $block_content, $block ) {
* @var string|null
*/
$inner_block_wrapper_classes = null;
$first_chunk = $block['innerContent'][0] ?? null;
$first_chunk = isset( $block['innerContent'][0] ) ? $block['innerContent'][0] : null;
if ( is_string( $first_chunk ) && count( $block['innerContent'] ) > 1 ) {
$first_chunk_processor = new WP_HTML_Tag_Processor( $first_chunk );
while ( $first_chunk_processor->next_tag() ) {
Expand Down