mirror_php/wordpress
1
0
Fork 0
mirror of git://develop.git.wordpress.org/ synced 2025-03-20 03:49:54 +01:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Editor: Prevent block stylesheets from loading when they do not exist.

Browse Source 
This fixes an issue where block stylesheets were being loaded even if they did not exist, causing 404 errors. The issue presented itself when the site was choosing to load block assets individually through the `should_load_separate_core_block_assets` filter hook.

This also fixes an issue where non-Core blocks would only be registered if they actually had asset files. This prevents developers from adding additional information to a style handle, such as inline styles through `wp_add_inline_style()`.

Props walbo, jorbin, aristath, desrosj, hellofromTonya.
Fixes #53375.

git-svn-id: https://develop.svn.wordpress.org/trunk@51254 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Jonathan Desrosiers 2021-06-29 00:07:53 +00:00
parent 22d7c94964
commit 2b0c4e11ac
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/wp-includes/blocks.php
View File

@ -151,10 +151,12 @@ function register_block_style_handle( $metadata, $field_name ) {
$style_uri = includes_url( 'blocks/' . str_replace( 'core/', '', $metadata['name'] ) . "/style$suffix.css" );
}
$style_handle = generate_block_asset_handle( $metadata['name'], $field_name );
$block_dir = dirname( $metadata['file'] );
$style_file = realpath( "$block_dir/$style_path" );
$version = file_exists( $style_file ) ? filemtime( $style_file ) : false;
$style_handle = generate_block_asset_handle( $metadata['name'], $field_name );
$block_dir = dirname( $metadata['file'] );
$style_file = realpath( "$block_dir/$style_path" );
$has_style_file = false !== $style_file;
$version = ! $is_core_block && $has_style_file ? filemtime( $style_file ) : false;
$style_uri = $has_style_file ? $style_uri : false;
$result = wp_register_style(
$style_handle,
$style_uri,
@ -164,7 +166,7 @@ function register_block_style_handle( $metadata, $field_name ) {
if ( file_exists( str_replace( '.css', '-rtl.css', $style_file ) ) ) {
wp_style_add_data( $style_handle, 'rtl', 'replace' );
}
if ( file_exists( $style_file ) ) {
if ( $has_style_file ) {
wp_style_add_data( $style_handle, 'path', $style_file );
}
@ -221,8 +223,8 @@ function register_block_type_from_metadata( $file_or_folder, $args = array() ) {
if ( ! isset( $metadata['style'] ) ) {
$metadata['style'] = "wp-block-$block_name";
}
if ( ! isset( $metadata['editor_style'] ) ) {
$metadata['editor_style'] = "wp-block-$block_name-editor";
if ( ! isset( $metadata['editorStyle'] ) ) {
$metadata['editorStyle'] = "wp-block-{$block_name}-editor";
}
}