Changeset 56005 for trunk/src/wp-includes/blocks.php

Timestamp:

06/23/2023 06:59:53 PM (2 years ago)

Author:

flixos90

Message:

Editor: Fix block editor styles being registered with frontend stylesheets.

This changeset fixes a bug where WordPress core's own block editor styles (wp-block-{$block_name}-editor) were referencing the same CSS files as their frontend equivalents (wp-block-{$block_name}). This would result in incorrect frontend styles potentially being loaded in the block editor.

Tests for the related logic have been added.

Props flixos90, joemcgill, mukesh27, spacedmonkey.
Fixes #58605.

File:

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

trunk/src/wp-includes/blocks.php

@@ -220 +220 @@
     $suffix = SCRIPT_DEBUG ? '' : '.min';
     if ( $is_core_block ) {
-        $style_path = "style$suffix.css";
+        $style_path = ( 'editorStyle' === $field_name ) ? "editor{$suffix}.css" : "style{$suffix}.css";
     }
 
@@ -240 +240 @@
             $style_uri = get_theme_file_uri( str_replace( $theme_path_norm, '', $style_path_norm ) );
         } elseif ( $is_core_block ) {
-            $style_uri = includes_url( 'blocks/' . str_replace( 'core/', '', $metadata['name'] ) . "/style$suffix.css" );
+            // All possible $style_path variants for core blocks are hard-coded above.
+            $style_uri = includes_url( 'blocks/' . str_replace( 'core/', '', $metadata['name'] ) . '/' . $style_path );
         }
     } else {