Add wp prefix to enable_real_time_collaboration option.

peterwilsoncc · peterwilsoncc · commit 4bba68be47e4 · 2026-02-23T14:53:19.000+11:00
diff --git a/src/wp-admin/includes/schema.php b/src/wp-admin/includes/schema.php
@@ -565,7 +565,7 @@ function populate_options( array $options = array() ) {
 		'wp_notes_notify'                 => 1,
 
 		// 7.0.0
-		'enable_real_time_collaboration'  => 0,
+		'wp_enable_real_time_collaboration'  => 0,
 	);
 
 	// 3.3.0
diff --git a/src/wp-admin/options-writing.php b/src/wp-admin/options-writing.php
@@ -110,10 +110,10 @@
 </td>
 </tr>
 <tr>
-<th scope="row"><label for="enable_real_time_collaboration"><?php _e( 'Collaboration' ); ?></label></th>
+<th scope="row"><label for="wp_enable_real_time_collaboration"><?php _e( 'Collaboration' ); ?></label></th>
 <td>
-	<input name="enable_real_time_collaboration" type="checkbox" id="enable_real_time_collaboration" value="1" <?php checked( '1', get_option( 'enable_real_time_collaboration' ) ); ?> />
-	<label for="enable_real_time_collaboration"><?php _e( 'Enable real-time collaboration' ); ?></label>
+	<input name="wp_enable_real_time_collaboration" type="checkbox" id="wp_enable_real_time_collaboration" value="1" <?php checked( '1', get_option( 'wp_enable_real_time_collaboration' ) ); ?> />
+	<label for="wp_enable_real_time_collaboration"><?php _e( 'Enable real-time collaboration' ); ?></label>
 </td>
 </tr>
 <?php
diff --git a/src/wp-admin/options.php b/src/wp-admin/options.php
@@ -153,7 +153,7 @@
 		'default_email_category',
 		'default_link_category',
 		'default_post_format',
-		'enable_real_time_collaboration',
+		'wp_enable_real_time_collaboration',
 	),
 );
 $allowed_options['misc']    = array();
diff --git a/src/wp-includes/collaboration.php b/src/wp-includes/collaboration.php
@@ -14,7 +14,7 @@
  * @access private
  */
 function wp_collaboration_inject_setting() {
-	if ( get_option( 'enable_real_time_collaboration' ) ) {
+	if ( get_option( 'wp_enable_real_time_collaboration' ) ) {
 		wp_add_inline_script(
 			'wp-core-data',
 			'window._wpCollaborationEnabled = true;',
diff --git a/src/wp-includes/option.php b/src/wp-includes/option.php
@@ -2887,7 +2887,7 @@ function register_initial_settings() {
 
 	register_setting(
 		'writing',
-		'enable_real_time_collaboration',
+		'wp_enable_real_time_collaboration',
 		array(
 			'type'              => 'boolean',
 			'description'       => __( 'Enable Real-Time Collaboration' ),
diff --git a/src/wp-includes/post.php b/src/wp-includes/post.php
@@ -657,7 +657,7 @@ function create_initial_post_types() {
 		)
 	);
 
-	if ( get_option( 'enable_real_time_collaboration' ) ) {
+	if ( get_option( 'wp_enable_real_time_collaboration' ) ) {
 		register_post_type(
 			'wp_sync_storage',
 			array(
@@ -8667,7 +8667,7 @@ function wp_create_initial_post_meta() {
 		)
 	);
 
-	if ( get_option( 'enable_real_time_collaboration' ) ) {
+	if ( get_option( 'wp_enable_real_time_collaboration' ) ) {
 		register_meta(
 			'post',
 			'_crdt_document',
diff --git a/src/wp-includes/rest-api.php b/src/wp-includes/rest-api.php
@@ -430,7 +430,7 @@ function create_initial_rest_routes() {
 	$icons_controller->register_routes();
 
 	// Collaboration.
-	if ( get_option( 'enable_real_time_collaboration' ) ) {
+	if ( get_option( 'wp_enable_real_time_collaboration' ) ) {
 		$sync_storage = new WP_Sync_Post_Meta_Storage();
 		$sync_server  = new WP_HTTP_Polling_Sync_Server( $sync_storage );
 		$sync_server->register_routes();
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-autosaves-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-autosaves-controller.php
@@ -254,7 +254,7 @@ public function create_item( $request ) {
 		 *   the saved post. This diff is then applied to the in-memory CRDT
 		 *   document, which can lead to duplicate inserts or deletions.
 		 */
-		$is_collaboration_enabled = get_option( 'enable_real_time_collaboration' );
+		$is_collaboration_enabled = get_option( 'wp_enable_real_time_collaboration' );
 
 		if ( $is_draft && (int) $post->post_author === $user_id && ! $post_lock && ! $is_collaboration_enabled ) {
 			/*
diff --git a/tests/phpunit/tests/rest-api/rest-autosaves-controller.php b/tests/phpunit/tests/rest-api/rest-autosaves-controller.php
@@ -570,8 +570,8 @@ public function test_rest_autosave_published_post() {
 	}
 
 	public function test_rest_autosave_draft_post_same_author() {
-		$original_option = get_option( 'enable_real_time_collaboration' );
-		update_option( 'enable_real_time_collaboration', false );
+		$original_option = get_option( 'wp_enable_real_time_collaboration' );
+		update_option( 'wp_enable_real_time_collaboration', false );
 
 		wp_set_current_user( self::$editor_id );
 
@@ -607,7 +607,7 @@ public function test_rest_autosave_draft_post_same_author() {
 		$this->assertSame( $post_data['post_excerpt'], $post->post_excerpt );
 
 		wp_delete_post( $post_id );
-		update_option( 'enable_real_time_collaboration', $original_option );
+		update_option( 'wp_enable_real_time_collaboration', $original_option );
 	}
 
 	public function test_rest_autosave_draft_post_different_author() {
@@ -748,8 +748,8 @@ public function test_get_item_sets_up_postdata() {
 	}
 
 	public function test_update_item_draft_page_with_parent() {
-		$original_option = get_option( 'enable_real_time_collaboration' );
-		update_option( 'enable_real_time_collaboration', false );
+		$original_option = get_option( 'wp_enable_real_time_collaboration' );
+		update_option( 'wp_enable_real_time_collaboration', false );
 
 		wp_set_current_user( self::$editor_id );
 		$request = new WP_REST_Request( 'POST', '/wp/v2/pages/' . self::$child_draft_page_id . '/autosaves' );
@@ -768,7 +768,7 @@ public function test_update_item_draft_page_with_parent() {
 
 		$this->assertSame( self::$child_draft_page_id, $data['id'] );
 		$this->assertSame( self::$parent_page_id, $data['parent'] );
-		update_option( 'enable_real_time_collaboration', $original_option );
+		update_option( 'wp_enable_real_time_collaboration', $original_option );
 	}
 
 	public function test_schema_validation_is_applied() {
@@ -934,8 +934,8 @@ public static function data_head_request_with_specified_fields_returns_success_r
 	 * same author should create a revision instead of updating the post directly.
 	 */
 	public function test_rest_autosave_draft_post_same_author_with_rtc() {
-		$original_option = get_option( 'enable_real_time_collaboration' );
-		update_option( 'enable_real_time_collaboration', true );
+		$original_option = get_option( 'wp_enable_real_time_collaboration' );
+		update_option( 'wp_enable_real_time_collaboration', true );
 
 		wp_set_current_user( self::$editor_id );
 
@@ -974,16 +974,16 @@ public function test_rest_autosave_draft_post_same_author_with_rtc() {
 		$this->assertSame( $post_data['post_excerpt'], $post->post_excerpt );
 
 		wp_delete_post( $post_id );
-		update_option( 'enable_real_time_collaboration', $original_option );
+		update_option( 'wp_enable_real_time_collaboration', $original_option );
 	}
 
 	/**
 	 * When real-time collaboration is enabled, autosaving a draft page with
 	 * a parent should create a revision instead of updating the page directly.
 	 */
 	public function test_update_item_draft_page_with_parent_with_rtc() {
-		$original_option = get_option( 'enable_real_time_collaboration' );
-		update_option( 'enable_real_time_collaboration', true );
+		$original_option = get_option( 'wp_enable_real_time_collaboration' );
+		update_option( 'wp_enable_real_time_collaboration', true );
 
 		wp_set_current_user( self::$editor_id );
 		$request = new WP_REST_Request( 'POST', '/wp/v2/pages/' . self::$child_draft_page_id . '/autosaves' );
@@ -1003,6 +1003,6 @@ public function test_update_item_draft_page_with_parent_with_rtc() {
 		// With RTC enabled, a revision is created instead of updating the page.
 		$this->assertNotSame( self::$child_draft_page_id, $data['id'] );
 		$this->assertSame( self::$child_draft_page_id, $data['parent'] );
-		update_option( 'enable_real_time_collaboration', $original_option );
+		update_option( 'wp_enable_real_time_collaboration', $original_option );
 	}
 }
diff --git a/tests/phpunit/tests/rest-api/rest-settings-controller.php b/tests/phpunit/tests/rest-api/rest-settings-controller.php
@@ -119,7 +119,7 @@ public function test_get_items() {
 			'default_ping_status',
 			'default_comment_status',
 			'site_icon', // Registered in wp-includes/blocks/site-logo.php
-			'enable_real_time_collaboration',
+			'wp_enable_real_time_collaboration',
 		);
 
 		if ( ! is_multisite() ) {
diff --git a/tests/phpunit/tests/rest-api/rest-sync-server.php b/tests/phpunit/tests/rest-api/rest-sync-server.php
@@ -14,7 +14,7 @@ class WP_Test_REST_Sync_Server extends WP_Test_REST_Controller_Testcase {
 	protected static $post_id;
 
 	public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
-		update_option( 'enable_real_time_collaboration', true );
+		update_option( 'wp_enable_real_time_collaboration', true );
 
 		self::$editor_id     = $factory->user->create( array( 'role' => 'editor' ) );
 		self::$subscriber_id = $factory->user->create( array( 'role' => 'subscriber' ) );
@@ -25,7 +25,7 @@ public static function wpTearDownAfterClass() {
 		self::delete_user( self::$editor_id );
 		self::delete_user( self::$subscriber_id );
 		wp_delete_post( self::$post_id, true );
-		delete_option( 'enable_real_time_collaboration' );
+		delete_option( 'wp_enable_real_time_collaboration' );
 	}
 
 	public function set_up() {
diff --git a/tests/qunit/fixtures/wp-api-generated.js b/tests/qunit/fixtures/wp-api-generated.js
@@ -11138,7 +11138,7 @@ mockedApiResponse.Schema = {
                             "type": "string",
                             "required": false
                         },
-                        "enable_real_time_collaboration": {
+                        "wp_enable_real_time_collaboration": {
                             "title": "",
                             "description": "Enable Real-Time Collaboration",
                             "type": "boolean",
@@ -14646,7 +14646,7 @@ mockedApiResponse.settings = {
     "use_smilies": true,
     "default_category": 1,
     "default_post_format": "0",
-    "enable_real_time_collaboration": false,
+    "wp_enable_real_time_collaboration": false,
     "posts_per_page": 10,
     "show_on_front": "posts",
     "page_on_front": 0,
