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

Jump to bottom

Fix error when using a navigation block that returns an empty fallback result #56629

Merged
merged 4 commits into from
Dec 11, 2023
Merged

Fix error when using a navigation block that returns an empty fallback result #56629

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4983de5
Fix fatal error when using a navigation block fallback that returns a…
talldan Nov 29, 2023
843d434
Fix get_inner_blocks_from_unstable_location function
talldan Nov 29, 2023
4630642
Use an empty WP_Block_List as a return value
talldan Nov 29, 2023
c23ede6
Add a unit test for get_inner_blocks_from_navigation_post
talldan Dec 11, 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 lib/compat/wordpress-6.5/class-wp-navigation-block-renderer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ private static function get_inner_blocks_html( $attributes, $inner_blocks ) {
private static function get_inner_blocks_from_navigation_post( $attributes ) {
$navigation_post = get_post( $attributes['ref'] );
if ( ! isset( $navigation_post ) ) {
return '';
talldan marked this conversation as resolved.
Show resolved Hide resolved
return new WP_Block_List( array(), $attributes );
}

// Only published posts are valid. If this is changed then a corresponding change
Expand Down Expand Up @@ -214,7 +214,7 @@ private static function get_inner_blocks_from_fallback( $attributes ) {

// Fallback my have been filtered so do basic test for validity.
if ( empty( $fallback_blocks ) || ! is_array( $fallback_blocks ) ) {
return '';
return new WP_Block_List( array(), $attributes );
Copy link
Contributor

Choose a reason for hiding this comment

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

Confirmed present in new block-library version of this file

gutenberg/packages/block-library/src/navigation/index.php

Lines 218 to 221 in e0005a8

// Fallback my have been filtered so do basic test for validity.
if ( empty( $fallback_blocks ) || ! is_array( $fallback_blocks ) ) {
return new WP_Block_List( array(), $attributes );
}

}

return new WP_Block_List( $fallback_blocks, $attributes );
Expand Down
2 changes: 1 addition & 1 deletion packages/block-library/src/navigation/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ function block_core_navigation_sort_menu_items_by_parent_id( $menu_items ) {
function block_core_navigation_get_inner_blocks_from_unstable_location( $attributes ) {
$menu_items = block_core_navigation_get_menu_items_at_location( $attributes['__unstableLocation'] );
if ( empty( $menu_items ) ) {
return '';
return new WP_Block_List( array(), $attributes );
}

$menu_items_by_parent_id = block_core_navigation_sort_menu_items_by_parent_id( $menu_items );
Expand Down
Loading