From b884ecf21ece368c44907d35255776c386656d80 Mon Sep 17 00:00:00 2001
From: isabel_brison <isabel_brison@git.wordpress.org>
Date: Tue, 23 Jan 2024 05:38:13 +0000
Subject: [PATCH] Editor: fix classname output on blocks without layout.

Prevents layout classnames from being output on blocks with no layout support and no child layout classnames by returning early from `wp_render_layout_support_flag`.

Props andrewserong.
Fixes #60292.

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


git-svn-id: http://core.svn.wordpress.org/trunk@56834 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/block-supports/layout.php | 3 +++
 wp-includes/version.php               | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/wp-includes/block-supports/layout.php b/wp-includes/block-supports/layout.php
index 67d6a3f1b7..4da4f24b23 100644
--- a/wp-includes/block-supports/layout.php
+++ b/wp-includes/block-supports/layout.php
@@ -615,6 +615,9 @@ function wp_render_layout_support_flag( $block_content, $block ) {
 			$processor->add_class( $class_name );
 		}
 		return $processor->get_updated_html();
+	} elseif ( ! $block_supports_layout ) {
+		// Ensure layout classnames are not injected if there is no layout support.
+		return $block_content;
 	}
 
 	$global_settings = wp_get_global_settings();
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 06767d3b73..636d21b9b2 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.5-alpha-57327';
+$wp_version = '6.5-alpha-57328';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.