From b020766e3da074f825d8eb53b629ab0abc10b514 Mon Sep 17 00:00:00 2001
From: gziolo <gziolo@git.wordpress.org>
Date: Fri, 20 May 2022 11:42:19 +0000
Subject: [PATCH] Editor: Fix opinionated block styles loading in editor

Related changes in Gutenberg: https://github.com/WordPress/gutenberg/pull/40937.

Backport for WordPress 6.0 RC 4.

Props jffng.
See #55567.


Built from https://develop.svn.wordpress.org/trunk@53419


git-svn-id: http://core.svn.wordpress.org/trunk@53008 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/block-editor.php | 5 ++++-
 wp-includes/version.php      | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/wp-includes/block-editor.php b/wp-includes/block-editor.php
index c872ae84fd..11df4c9a10 100644
--- 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
index bdef0b28f7..8b88cd04fd 100644
--- 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.