Changeset 51254

Timestamp:

06/29/2021 12:07:53 AM (3 years ago)

Author:

desrosj

Message:

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

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.

File:

• trunk/src/wp-includes/blocks.php (modified) (3 diffs)

trunk/src/wp-includes/blocks.php

@@ -152 +152 @@
     }
 
-    $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,
@@ -165 +167 @@
         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 );
     }
@@ -222 +224 @@
             $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";
         }
     }