A couple more removals that I previously missed

WordPress · Jun 13, 2023 · fde9a8d · fde9a8d
1 parent ae7dfef
commit fde9a8d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/lib/block-supports/layout.php b/lib/block-supports/layout.php
@@ -583,13 +583,8 @@ function gutenberg_render_layout_support_flag( $block_content, $block ) {
 		return (string) $content;
 	}
 
-	$global_settings        = gutenberg_get_global_settings();
-	$global_layout_settings = _wp_array_get( $global_settings, array( 'layout' ), null );
-	$used_layout            = isset( $block['attrs']['layout'] ) ? $block['attrs']['layout'] : _wp_array_get( $block_type->supports, array( '__experimentalLayout', 'default' ), array() );
-
-	if ( isset( $used_layout['inherit'] ) && $used_layout['inherit'] && ! $global_layout_settings ) {
-		return $block_content;
-	}
+	$global_settings = gutenberg_get_global_settings();
+	$used_layout     = isset( $block['attrs']['layout'] ) ? $block['attrs']['layout'] : _wp_array_get( $block_type->supports, array( '__experimentalLayout', 'default' ), array() );
 
 	$class_names        = array();
 	$layout_definitions = gutenberg_get_layout_definitions();

diff --git a/lib/class-wp-theme-json-gutenberg.php b/lib/class-wp-theme-json-gutenberg.php
@@ -337,6 +337,7 @@ class WP_Theme_JSON_Gutenberg {
 	 * @since 6.1.0 Added `layout.definitions` and `useRootPaddingAwareAlignments`.
 	 * @since 6.2.0 Added `dimensions.minHeight`, 'shadow.presets', 'shadow.defaultPresets',
 	 *              `position.fixed` and `position.sticky`.
+	 * @since 6.3.0 Removed `layout.definitions`.
 	 * @var array
 	 */
 	const VALID_SETTINGS = array(
@@ -371,7 +372,6 @@ class WP_Theme_JSON_Gutenberg {
 		),
 		'layout'                        => array(
 			'contentSize' => null,
-			'definitions' => null,
 			'wideSize'    => null,
 		),
 		'position'                      => array(