From 41e6d89bcd10eef728aea03e5c9af4e054bae778 Mon Sep 17 00:00:00 2001
From: chriszarate <chris.zarate@automattic.com>
Date: Wed, 18 Mar 2026 11:16:32 -0600
Subject: [PATCH 1/7] Change RTC option name

---
 ...lass-gutenberg-rest-autosaves-controller.php |  2 +-
 lib/compat/wordpress-7.0/collaboration.php      | 17 +++++++++++------
 .../fixtures/collaboration-utils.ts             |  2 +-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/lib/compat/wordpress-7.0/class-gutenberg-rest-autosaves-controller.php b/lib/compat/wordpress-7.0/class-gutenberg-rest-autosaves-controller.php
index e5730414d51c5c..a65c345f1250cd 100644
--- a/lib/compat/wordpress-7.0/class-gutenberg-rest-autosaves-controller.php
+++ b/lib/compat/wordpress-7.0/class-gutenberg-rest-autosaves-controller.php
@@ -101,7 +101,7 @@ public function create_item( $request ) {
 		 * Load the real-time collaboration setting and, when enabled, ensure that an
 		 * an autosave revision is always targeted.
 		 */
-		$is_collaboration_enabled = get_option( 'wp_enable_real_time_collaboration' );
+		$is_collaboration_enabled = get_option( 'wp_collaboration_enabled' );
 
 		if ( $is_draft && (int) $post->post_author === $user_id && ! $post_lock && ! $is_collaboration_enabled ) {
 			/*
diff --git a/lib/compat/wordpress-7.0/collaboration.php b/lib/compat/wordpress-7.0/collaboration.php
index 9dcd18e22133a4..34f386d4cb1193 100644
--- a/lib/compat/wordpress-7.0/collaboration.php
+++ b/lib/compat/wordpress-7.0/collaboration.php
@@ -103,7 +103,7 @@ function gutenberg_rest_api_crdt_post_meta() {
 	 * Registers the real-time collaboration setting.
 	 */
 	function gutenberg_register_real_time_collaboration_setting() {
-		$option_name = 'wp_enable_real_time_collaboration';
+		$option_name = 'wp_collaboration_enabled';
 
 		register_setting(
 			'writing',
@@ -124,8 +124,8 @@ function () use ( $option_name ) {
 				$option_value = get_option( $option_name );
 
 				?>
-				<label for="wp_enable_real_time_collaboration">
-					<input name="wp_enable_real_time_collaboration" type="checkbox" id="wp_enable_real_time_collaboration" value="1" <?php checked( '1', $option_value ); ?>/>
+				<label for="wp_collaboration_enabled">
+					<input name="wp_collaboration_enabled" type="checkbox" id="wp_collaboration_enabled" value="1" <?php checked( '1', $option_value ); ?>/>
 					<?php _e( 'Enable real-time collaboration', 'gutenberg' ); ?>
 				</label>
 				<?php
@@ -142,7 +142,7 @@ function () use ( $option_name ) {
 function gutenberg_inject_real_time_collaboration_setting() {
 	global $pagenow;
 
-	if ( ! get_option( 'wp_enable_real_time_collaboration' ) ) {
+	if ( ! get_option( 'wp_collaboration_enabled' ) ) {
 		return;
 	}
 
@@ -162,7 +162,12 @@ function gutenberg_inject_real_time_collaboration_setting() {
 	);
 }
 add_action( 'admin_init', 'gutenberg_inject_real_time_collaboration_setting' );
-add_filter( 'default_option_wp_enable_real_time_collaboration', '__return_true' );
+
+/**
+ * Core filters the default value, so hook with a higher priority to ensure the
+ * setting is enabled by default when the Gutenberg plugin is active.
+ */
+add_filter( 'default_option_wp_collaboration_enabled', '__return_true', 500 );
 
 /**
  * Modifies the post list UI and heartbeat responses for real-time collaboration.
@@ -175,7 +180,7 @@ function gutenberg_inject_real_time_collaboration_setting() {
 function gutenberg_post_list_collaboration_ui() {
 	global $pagenow;
 
-	if ( ! get_option( 'wp_enable_real_time_collaboration' ) ) {
+	if ( ! get_option( 'wp_collaboration_enabled' ) ) {
 		return;
 	}
 
diff --git a/test/e2e/specs/editor/collaboration/fixtures/collaboration-utils.ts b/test/e2e/specs/editor/collaboration/fixtures/collaboration-utils.ts
index 0b2b3a24779cf4..4bb9ea1606f984 100644
--- a/test/e2e/specs/editor/collaboration/fixtures/collaboration-utils.ts
+++ b/test/e2e/specs/editor/collaboration/fixtures/collaboration-utils.ts
@@ -334,7 +334,7 @@ export async function setCollaboration(
 	const html = await response.text();
 	const nonce = html.match( /name="_wpnonce" value="([^"]+)"/ )![ 1 ];
 
-	const optionName = 'wp_enable_real_time_collaboration';
+	const optionName = 'wp_collaboration_enabled';
 	const optionValue = enabled ? 1 : 0;
 
 	const formData: Record< string, string | number > = {

From 980d57c8e15ce662d1e899e3ce4de34b40de24f0 Mon Sep 17 00:00:00 2001
From: chriszarate <chris.zarate@automattic.com>
Date: Wed, 18 Mar 2026 11:23:40 -0600
Subject: [PATCH 2/7] Add backport changelog

---
 backport-changelog/7.0/11289.md | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 backport-changelog/7.0/11289.md

diff --git a/backport-changelog/7.0/11289.md b/backport-changelog/7.0/11289.md
new file mode 100644
index 00000000000000..a7c5f7d4a4c13d
--- /dev/null
+++ b/backport-changelog/7.0/11289.md
@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/11289
+
+* https://github.com/WordPress/gutenberg/pull/76643

From d826466a865f773eb00868cc6a7d3bf56956e3d4 Mon Sep 17 00:00:00 2001
From: chriszarate <chris.zarate@automattic.com>
Date: Wed, 18 Mar 2026 15:52:31 -0600
Subject: [PATCH 3/7] Restore option migration

---
 lib/upgrade.php | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/lib/upgrade.php b/lib/upgrade.php
index 51841efb25d15f..e2f01004d34358 100644
--- a/lib/upgrade.php
+++ b/lib/upgrade.php
@@ -25,7 +25,7 @@ function _gutenberg_migrate_database() {
 			_gutenberg_migrate_remove_fse_drafts();
 		}
 
-		if ( version_compare( $gutenberg_installed_version, '22.6.0', '<' ) ) {
+		if ( version_compare( $gutenberg_installed_version, '22.8.0', '<' ) ) {
 			_gutenberg_migrate_enable_real_time_collaboration();
 		}
 
@@ -62,3 +62,27 @@ function _gutenberg_migrate_remove_fse_drafts() {
 	delete_option( 'gutenberg_last_synchronize_theme_template_checks' );
 	delete_option( 'gutenberg_last_synchronize_theme_template-part_checks' );
 }
+
+/**
+ * Update RTC option name.
+ *
+ * @since 22.8.0
+ */
+function _gutenberg_migrate_enable_real_time_collaboration() {
+	$value1 = get_option( 'enable_real_time_collaboration', '1' );
+	$value2 = get_option( 'wp_enable_real_time_collaboration', '1' );
+
+	// RTC is enabled by default in the plugin, so only set the value if it was
+	// previously disabled. Otherwise rely on the default value.
+	if ( ! $value1 || ! $value2 ) {
+		update_option( 'wp_collaboration_enabled', '0' );
+	}
+
+	delete_option( 'enable_real_time_collaboration' );
+	delete_option( 'wp_enable_real_time_collaboration' );
+}
+
+// Deletion of the `_wp_file_based` term (in _gutenberg_migrate_remove_fse_drafts) must happen
+// after its taxonomy (`wp_theme`) is registered. This happens in `gutenberg_register_wp_theme_taxonomy`,
+// which is hooked into `init` (default priority, i.e. 10).
+add_action( 'init', '_gutenberg_migrate_database', 20 );

From a859af483d19336b3cfb504256558a33cf126c37 Mon Sep 17 00:00:00 2001
From: chriszarate <chris.zarate@automattic.com>
Date: Wed, 18 Mar 2026 16:02:55 -0600
Subject: [PATCH 4/7] Cover previous option name in setCollaboration

---
 .../specs/editor/collaboration/fixtures/collaboration-utils.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/e2e/specs/editor/collaboration/fixtures/collaboration-utils.ts b/test/e2e/specs/editor/collaboration/fixtures/collaboration-utils.ts
index 4bb9ea1606f984..4397ff5d97256e 100644
--- a/test/e2e/specs/editor/collaboration/fixtures/collaboration-utils.ts
+++ b/test/e2e/specs/editor/collaboration/fixtures/collaboration-utils.ts
@@ -349,6 +349,9 @@ export async function setCollaboration(
 
 	formData[ optionName ] = optionValue;
 
+	// Also set it for the previous option name until it is merged into Core.
+	formData.wp_enable_real_time_collaboration = optionValue;
+
 	await requestUtils.request.post( '/wp-admin/options.php', {
 		form: formData,
 		failOnStatusCode: true,

From e8fd12acde8c95ef0455dbb8fa3709f77b38d52e Mon Sep 17 00:00:00 2001
From: chriszarate <chris.zarate@automattic.com>
Date: Wed, 18 Mar 2026 16:47:41 -0600
Subject: [PATCH 5/7] Respect previous value in setting injection

---
 lib/compat/wordpress-7.0/collaboration.php                     | 2 +-
 .../specs/editor/collaboration/fixtures/collaboration-utils.ts | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/lib/compat/wordpress-7.0/collaboration.php b/lib/compat/wordpress-7.0/collaboration.php
index 34f386d4cb1193..02bb695765b4b6 100644
--- a/lib/compat/wordpress-7.0/collaboration.php
+++ b/lib/compat/wordpress-7.0/collaboration.php
@@ -142,7 +142,7 @@ function () use ( $option_name ) {
 function gutenberg_inject_real_time_collaboration_setting() {
 	global $pagenow;
 
-	if ( ! get_option( 'wp_collaboration_enabled' ) ) {
+	if ( ! get_option( 'wp_collaboration_enabled' ) || ! get_option( 'wp_enable_real_time_collaboration' ) ) {
 		return;
 	}
 
diff --git a/test/e2e/specs/editor/collaboration/fixtures/collaboration-utils.ts b/test/e2e/specs/editor/collaboration/fixtures/collaboration-utils.ts
index 4397ff5d97256e..4bb9ea1606f984 100644
--- a/test/e2e/specs/editor/collaboration/fixtures/collaboration-utils.ts
+++ b/test/e2e/specs/editor/collaboration/fixtures/collaboration-utils.ts
@@ -349,9 +349,6 @@ export async function setCollaboration(
 
 	formData[ optionName ] = optionValue;
 
-	// Also set it for the previous option name until it is merged into Core.
-	formData.wp_enable_real_time_collaboration = optionValue;
-
 	await requestUtils.request.post( '/wp-admin/options.php', {
 		form: formData,
 		failOnStatusCode: true,

From 9f75d80ecf2e031c0edecf0c6fd0662afadedc74 Mon Sep 17 00:00:00 2001
From: chriszarate <chris.zarate@automattic.com>
Date: Wed, 18 Mar 2026 18:16:48 -0600
Subject: [PATCH 6/7] Update migration const

---
 lib/compat/wordpress-7.0/collaboration.php | 2 +-
 lib/upgrade.php                            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/compat/wordpress-7.0/collaboration.php b/lib/compat/wordpress-7.0/collaboration.php
index 02bb695765b4b6..34f386d4cb1193 100644
--- a/lib/compat/wordpress-7.0/collaboration.php
+++ b/lib/compat/wordpress-7.0/collaboration.php
@@ -142,7 +142,7 @@ function () use ( $option_name ) {
 function gutenberg_inject_real_time_collaboration_setting() {
 	global $pagenow;
 
-	if ( ! get_option( 'wp_collaboration_enabled' ) || ! get_option( 'wp_enable_real_time_collaboration' ) ) {
+	if ( ! get_option( 'wp_collaboration_enabled' ) ) {
 		return;
 	}
 
diff --git a/lib/upgrade.php b/lib/upgrade.php
index e2f01004d34358..9d6a60f945747c 100644
--- a/lib/upgrade.php
+++ b/lib/upgrade.php
@@ -7,7 +7,7 @@
 
 if ( ! defined( '_GUTENBERG_VERSION_MIGRATION' ) ) {
 	// It's necessary to update this version every time a new migration is needed.
-	define( '_GUTENBERG_VERSION_MIGRATION', '22.6.0' );
+	define( '_GUTENBERG_VERSION_MIGRATION', '22.8.0' );
 }
 
 /**

From 2fd35cbf539eac3d3b36ce06c44261fadcc0b4b9 Mon Sep 17 00:00:00 2001
From: chriszarate <chris.zarate@automattic.com>
Date: Wed, 18 Mar 2026 19:23:17 -0600
Subject: [PATCH 7/7] Temporary bridge

---
 lib/compat/wordpress-7.0/collaboration.php                  | 6 ++++++
 .../editor/collaboration/fixtures/collaboration-utils.ts    | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/lib/compat/wordpress-7.0/collaboration.php b/lib/compat/wordpress-7.0/collaboration.php
index 34f386d4cb1193..73ae0c44991442 100644
--- a/lib/compat/wordpress-7.0/collaboration.php
+++ b/lib/compat/wordpress-7.0/collaboration.php
@@ -146,6 +146,12 @@ function gutenberg_inject_real_time_collaboration_setting() {
 		return;
 	}
 
+	// Temporary check to bridge the short time when this is change is merged in
+	// Gutenberg but not in core.
+	if ( ! get_option( 'wp_enable_real_time_collaboration' ) ) {
+		return;
+	}
+
 	// Disable real-time collaboration on the site editor.
 	$enabled = true;
 	if (
diff --git a/test/e2e/specs/editor/collaboration/fixtures/collaboration-utils.ts b/test/e2e/specs/editor/collaboration/fixtures/collaboration-utils.ts
index 4bb9ea1606f984..20f35c50926d86 100644
--- a/test/e2e/specs/editor/collaboration/fixtures/collaboration-utils.ts
+++ b/test/e2e/specs/editor/collaboration/fixtures/collaboration-utils.ts
@@ -349,6 +349,10 @@ export async function setCollaboration(
 
 	formData[ optionName ] = optionValue;
 
+	// Temporary addition to bridge the short time when this is change is merged in
+	// Gutenberg but not in core.
+	formData.wp_enable_real_time_collaboration = optionValue;
+
 	await requestUtils.request.post( '/wp-admin/options.php', {
 		form: formData,
 		failOnStatusCode: true,