From 3593d9e8a69eab7fe4c4f73d4bc52c1e10566eee Mon Sep 17 00:00:00 2001 From: costdev Date: Sat, 7 Aug 2021 22:00:07 +0100 Subject: [PATCH 1/3] Fix #53806 --- src/wp-includes/blocks.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wp-includes/blocks.php b/src/wp-includes/blocks.php index 96b897aeec5f8..2192302100638 100644 --- a/src/wp-includes/blocks.php +++ b/src/wp-includes/blocks.php @@ -202,9 +202,9 @@ function register_block_style_handle( $metadata, $field_name ) { */ function register_block_type_from_metadata( $file_or_folder, $args = array() ) { $filename = 'block.json'; - $metadata_file = ( substr( $file_or_folder, -strlen( $filename ) ) !== $filename ) ? + $metadata_file = (is_dir($file_or_folder) || substr($file_or_folder, -5) !== '.json') ? trailingslashit( $file_or_folder ) . $filename : - $file_or_folder; + $file_or_folder; if ( ! file_exists( $metadata_file ) ) { return false; } From abe0ef51071f3f6e513dbb59a3ae99a99148f29d Mon Sep 17 00:00:00 2001 From: costdev Date: Sat, 7 Aug 2021 22:16:07 +0100 Subject: [PATCH 2/3] Fix Coding standards failure --- src/wp-includes/blocks.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wp-includes/blocks.php b/src/wp-includes/blocks.php index 2192302100638..022fb020a544d 100644 --- a/src/wp-includes/blocks.php +++ b/src/wp-includes/blocks.php @@ -202,9 +202,9 @@ function register_block_style_handle( $metadata, $field_name ) { */ function register_block_type_from_metadata( $file_or_folder, $args = array() ) { $filename = 'block.json'; - $metadata_file = (is_dir($file_or_folder) || substr($file_or_folder, -5) !== '.json') ? + $metadata_file = ( is_dir( $file_or_folder ) || substr( $file_or_folder, -5 ) !== '.json' ) ? trailingslashit( $file_or_folder ) . $filename : - $file_or_folder; + $file_or_folder; if ( ! file_exists( $metadata_file ) ) { return false; } From c5cf2fe1c4c56fc7f70b2e54f00054a96673bb5b Mon Sep 17 00:00:00 2001 From: costdev Date: Sun, 8 Aug 2021 21:55:57 +0100 Subject: [PATCH 3/3] Remove irrelevant check for `.json` ending --- src/wp-includes/blocks.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wp-includes/blocks.php b/src/wp-includes/blocks.php index 022fb020a544d..91c3179b8474b 100644 --- a/src/wp-includes/blocks.php +++ b/src/wp-includes/blocks.php @@ -202,7 +202,7 @@ function register_block_style_handle( $metadata, $field_name ) { */ function register_block_type_from_metadata( $file_or_folder, $args = array() ) { $filename = 'block.json'; - $metadata_file = ( is_dir( $file_or_folder ) || substr( $file_or_folder, -5 ) !== '.json' ) ? + $metadata_file = ( is_dir( $file_or_folder ) ) ? trailingslashit( $file_or_folder ) . $filename : $file_or_folder; if ( ! file_exists( $metadata_file ) ) {