From a578de586058334233fb4d03c80c31df4420eb1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Greg=20Zi=C3=83=C2=B3=C3=85=E2=80=9Akowski?= Date: Wed, 21 Feb 2024 11:18:34 +0000 Subject: [PATCH] Editor: Add fallback for block version when registering block script module It aligns implementation with how regular scripts are handled. Follow-up [57437]. See #60233. git-svn-id: https://develop.svn.wordpress.org/trunk@57677 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/blocks.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/wp-includes/blocks.php b/src/wp-includes/blocks.php index 242429a424..854992de57 100644 --- a/src/wp-includes/blocks.php +++ b/src/wp-includes/blocks.php @@ -172,12 +172,14 @@ function register_block_script_module_id( $metadata, $field_name, $index = 0 ) { $module_asset = ! empty( $module_asset_path ) ? require $module_asset_path : array(); $module_dependencies = isset( $module_asset['dependencies'] ) ? $module_asset['dependencies'] : array(); + $block_version = isset( $metadata['version'] ) ? $metadata['version'] : false; + $module_version = isset( $module_asset['version'] ) ? $module_asset['version'] : $block_version; wp_register_script_module( $module_id, $module_uri, $module_dependencies, - isset( $module_asset['version'] ) ? $module_asset['version'] : false + $module_version ); return $module_id; @@ -225,7 +227,7 @@ function register_block_script_handle( $metadata, $field_name, $index = 0 ) { ); // Asset file for blocks is optional. See https://core.trac.wordpress.org/ticket/60460. - $script_asset = ! empty( $script_asset_path ) ? require $script_asset_path : array(); + $script_asset = ! empty( $script_asset_path ) ? require $script_asset_path : array(); $script_handle = isset( $script_asset['handle'] ) ? $script_asset['handle'] : generate_block_asset_handle( $metadata['name'], $field_name, $index );