From 53bd78fd92bcbf1a7edfeba6251d1ccc0f98ae1b Mon Sep 17 00:00:00 2001 From: Robert Anderson Date: Mon, 29 Nov 2021 23:29:52 +0000 Subject: [PATCH] Restore block PHP to canonical version in @wordpress/block-library r52272 erroneously modified `src/wp-includes/blocks/navigation.php`. This file is copied from `@wordpress/block-library` and so must be updated via npm. This commit restores the file by running `grunt build --dev`. Follows [52272]. See #54506. git-svn-id: https://develop.svn.wordpress.org/trunk@52273 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/blocks/navigation.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/wp-includes/blocks/navigation.php b/src/wp-includes/blocks/navigation.php index 71c999e4a5..e3848190c6 100644 --- a/src/wp-includes/blocks/navigation.php +++ b/src/wp-includes/blocks/navigation.php @@ -183,6 +183,14 @@ function render_block_core_navigation( $attributes, $content, $block ) { $inner_blocks = new WP_Block_List( $parsed_blocks, $attributes ); } + if ( ! empty( $block->context['navigationArea'] ) ) { + $area = $block->context['navigationArea']; + $mapping = get_option( 'wp_navigation_areas', array() ); + if ( ! empty( $mapping[ $area ] ) ) { + $attributes['navigationMenuId'] = $mapping[ $area ]; + } + } + // Load inner blocks from the navigation post. if ( array_key_exists( 'navigationMenuId', $attributes ) ) { $navigation_post = get_post( $attributes['navigationMenuId'] );