From d966a9f046bf97886ef723d327c6a9a7cfe2d0a3 Mon Sep 17 00:00:00 2001
From: isabel_brison <isabel_brison@git.wordpress.org>
Date: Mon, 8 Jan 2024 06:23:14 +0000
Subject: [PATCH] Editor: add setting to disable layout content and wide size
 controls.

Adds support for an `allowCustomContentAndWideSize` setting in `WP_Theme_JSON` valid settings.

Props andrewserong.
Fixes #60133.

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


git-svn-id: http://core.svn.wordpress.org/trunk@56753 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/class-wp-theme-json.php | 8 +++++---
 wp-includes/version.php             | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/wp-includes/class-wp-theme-json.php b/wp-includes/class-wp-theme-json.php
index 9fea12a8d3..4826de8648 100644
--- a/wp-includes/class-wp-theme-json.php
+++ b/wp-includes/class-wp-theme-json.php
@@ -344,6 +344,7 @@ class WP_Theme_JSON {
 	 * @since 6.3.0 Added support for `typography.textColumns`, removed `layout.definitions`.
 	 * @since 6.4.0 Added support for `layout.allowEditing`, `background.backgroundImage`,
 	 *              `typography.writingMode`, `lightbox.enabled` and `lightbox.allowEditing`.
+	 * @since 6.5.0 Added support for `layout.allowCustomContentAndWideSize`.
 	 * @var array
 	 */
 	const VALID_SETTINGS = array(
@@ -380,9 +381,10 @@ class WP_Theme_JSON {
 			'minHeight' => null,
 		),
 		'layout'                        => array(
-			'contentSize'  => null,
-			'wideSize'     => null,
-			'allowEditing' => null,
+			'contentSize'                   => null,
+			'wideSize'                      => null,
+			'allowEditing'                  => null,
+			'allowCustomContentAndWideSize' => null,
 		),
 		'lightbox'                      => array(
 			'enabled'      => null,
diff --git a/wp-includes/version.php b/wp-includes/version.php
index f8aa556351..2084fa2f76 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.5-alpha-57246';
+$wp_version = '6.5-alpha-57247';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.