Editor: Fix opinionated block styles loading in editor

Related changes in Gutenberg: WordPress/gutenberg#40937. Backport for WordPress 6.0 RC 4. Props jffng. See #55567. Built from https://develop.svn.wordpress.org/trunk@53419
whereiscodedude · May 20, 2022 · eb47d33 · eb47d33
1 parent a0bfaef
commit eb47d33
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/wp-includes/block-editor.php b/wp-includes/block-editor.php
@@ -309,10 +309,13 @@ function _wp_get_iframed_editor_assets() {
 	$style_handles  = array(
 		'wp-block-editor',
 		'wp-block-library',
-		'wp-block-library-theme',
 		'wp-edit-blocks',
 	);
 
+	if ( current_theme_supports( 'wp-block-styles' ) ) {
+		$style_handles[] = 'wp-block-library-theme';
+	}
+
 	if ( 'widgets.php' === $pagenow || 'customize.php' === $pagenow ) {
 		$style_handles[] = 'wp-widgets';
 		$style_handles[] = 'wp-edit-widgets';

diff --git a/wp-includes/version.php b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.1-alpha-53418';
+$wp_version = '6.1-alpha-53419';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.