From 2bd1a8ac8379fd6e8477a014c8e78df7aad6dadf Mon Sep 17 00:00:00 2001 From: dmsnell Date: Thu, 26 Mar 2026 15:27:53 +0000 Subject: [PATCH] Build: Restore deleted files and reconnect version history. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In [61438] and successive fixes, a number of files were deleted and added to `.gitignore`. These files were removed because they are built from the Gutenberg repo and copied into the Core repo. However, because the only artifact of udpates to those files are an opaque hash change, it’s important to have a copy of the files at the change in version control for the purposes of auditing, debugging, benchmarking, and tracking. This patch merges a version-history from before the initial changeset and reattaches the version-tracking to these files, creating immitation commits along each step where the files were updated in a Gutenberg sync. Developed in: https://github.com/WordPress/wordpress-develop/pull/11064 Discussed in: https://core.trac.wordpress.org/ticket/64393 Follow-up to [61438]. Props 762e5e74, aidvu, desrosj, dmsnell, jonsurrell, youknowriad. See #64393. Built from https://develop.svn.wordpress.org/trunk@62143 git-svn-id: http://core.svn.wordpress.org/trunk@61425 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/blocks/index.php | 21 +++------------------ wp-includes/version.php | 2 +- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/wp-includes/blocks/index.php b/wp-includes/blocks/index.php index 65d2cb5ad6..98615ea1ba 100644 --- a/wp-includes/blocks/index.php +++ b/wp-includes/blocks/index.php @@ -13,15 +13,9 @@ if ( ! defined( 'ABSPATH' ) ) { define( 'BLOCKS_PATH', ABSPATH . WPINC . '/blocks/' ); // Include files required for core blocks registration. -if ( file_exists( BLOCKS_PATH . 'legacy-widget.php' ) ) { - require BLOCKS_PATH . 'legacy-widget.php'; -} -if ( file_exists( BLOCKS_PATH . 'widget-group.php' ) ) { - require BLOCKS_PATH . 'widget-group.php'; -} -if ( file_exists( BLOCKS_PATH . 'require-dynamic-blocks.php' ) ) { - require BLOCKS_PATH . 'require-dynamic-blocks.php'; -} +require BLOCKS_PATH . 'legacy-widget.php'; +require BLOCKS_PATH . 'widget-group.php'; +require BLOCKS_PATH . 'require-dynamic-blocks.php'; /** * Registers core block style handles. @@ -49,9 +43,6 @@ function register_core_block_style_handles() { static $core_blocks_meta; if ( ! $core_blocks_meta ) { - if ( ! file_exists( BLOCKS_PATH . 'blocks-json.php' ) ) { - return; - } $core_blocks_meta = require BLOCKS_PATH . 'blocks-json.php'; } @@ -159,9 +150,6 @@ add_action( 'init', 'register_core_block_style_handles', 9 ); * @since 5.5.0 */ function register_core_block_types_from_metadata() { - if ( ! file_exists( BLOCKS_PATH . 'require-static-blocks.php' ) ) { - return; - } $block_folders = require BLOCKS_PATH . 'require-static-blocks.php'; foreach ( $block_folders as $block_folder ) { register_block_type_from_metadata( @@ -181,9 +169,6 @@ add_action( 'init', 'register_core_block_types_from_metadata' ); * @since 6.7.0 */ function wp_register_core_block_metadata_collection() { - if ( ! file_exists( BLOCKS_PATH . 'blocks-json.php' ) ) { - return; - } wp_register_block_metadata_collection( BLOCKS_PATH, BLOCKS_PATH . 'blocks-json.php' diff --git a/wp-includes/version.php b/wp-includes/version.php index 6e6b68a89b..6f763ddd0b 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '7.0-RC1-62116'; +$wp_version = '7.0-RC1-62143'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.