diff --git a/src/wp-admin/includes/schema.php b/src/wp-admin/includes/schema.php index 7a95f65ad80cc..3aa377a0edd43 100644 --- a/src/wp-admin/includes/schema.php +++ b/src/wp-admin/includes/schema.php @@ -563,9 +563,6 @@ function populate_options( array $options = array() ) { // 6.9.0 'wp_notes_notify' => 1, - - // 7.0.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 index e9031cec59f1e..0166a2927431d 100644 --- a/src/wp-admin/options-writing.php +++ b/src/wp-admin/options-writing.php @@ -110,10 +110,10 @@ - + - /> - + /> + 'boolean', - 'description' => __( 'Enable Real-Time Collaboration' ), + 'description' => __( 'Disable real-time collaboration' ), 'sanitize_callback' => 'rest_sanitize_boolean', 'default' => false, 'show_in_rest' => true, diff --git a/src/wp-includes/post.php b/src/wp-includes/post.php index 896142603278b..6deb00f0fcd26 100644 --- a/src/wp-includes/post.php +++ b/src/wp-includes/post.php @@ -657,7 +657,7 @@ function create_initial_post_types() { ) ); - if ( get_option( 'wp_enable_real_time_collaboration' ) ) { + if ( ! boolval( get_option( 'wp_disable_real_time_collaboration' ) ) ) { register_post_type( 'wp_sync_storage', array( @@ -8671,7 +8671,7 @@ function wp_create_initial_post_meta() { ) ); - if ( get_option( 'wp_enable_real_time_collaboration' ) ) { + if ( ! boolval( get_option( 'wp_disable_real_time_collaboration' ) ) ) { register_meta( 'post', '_crdt_document', diff --git a/src/wp-includes/rest-api.php b/src/wp-includes/rest-api.php index df7f262d3aa58..471070b22fd8f 100644 --- 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( 'wp_enable_real_time_collaboration' ) ) { + if ( ! boolval( get_option( 'wp_disable_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 index 36839d9c72bbf..881fd80146335 100644 --- 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,9 +254,9 @@ 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( 'wp_enable_real_time_collaboration' ); + $is_collaboration_disabled = boolval( get_option( 'wp_disable_real_time_collaboration' ) ); - if ( $is_draft && (int) $post->post_author === $user_id && ! $post_lock && ! $is_collaboration_enabled ) { + if ( $is_draft && (int) $post->post_author === $user_id && ! $post_lock && $is_collaboration_disabled ) { /* * Draft posts for the same author: autosaving updates the post and does not create a revision. * Convert the post object to an array and add slashes, wp_update_post() expects escaped array. diff --git a/tests/phpunit/tests/rest-api/rest-autosaves-controller.php b/tests/phpunit/tests/rest-api/rest-autosaves-controller.php index b2236e5b0de02..6180feb356b7d 100644 --- a/tests/phpunit/tests/rest-api/rest-autosaves-controller.php +++ b/tests/phpunit/tests/rest-api/rest-autosaves-controller.php @@ -570,8 +570,7 @@ public function test_rest_autosave_published_post() { } public function test_rest_autosave_draft_post_same_author() { - $original_option = get_option( 'wp_enable_real_time_collaboration' ); - update_option( 'wp_enable_real_time_collaboration', false ); + add_filter( 'pre_option_wp_disable_real_time_collaboration', '__return_true' ); wp_set_current_user( self::$editor_id ); @@ -607,7 +606,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( 'wp_enable_real_time_collaboration', $original_option ); + remove_filter( 'pre_option_wp_disable_real_time_collaboration', '__return_true' ); } public function test_rest_autosave_draft_post_different_author() { @@ -748,8 +747,7 @@ public function test_get_item_sets_up_postdata() { } public function test_update_item_draft_page_with_parent() { - $original_option = get_option( 'wp_enable_real_time_collaboration' ); - update_option( 'wp_enable_real_time_collaboration', false ); + add_filter( 'pre_option_wp_disable_real_time_collaboration', '__return_true' ); wp_set_current_user( self::$editor_id ); $request = new WP_REST_Request( 'POST', '/wp/v2/pages/' . self::$child_draft_page_id . '/autosaves' ); @@ -768,7 +766,8 @@ 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( 'wp_enable_real_time_collaboration', $original_option ); + + remove_filter( 'pre_option_wp_disable_real_time_collaboration', '__return_true' ); } public function test_schema_validation_is_applied() { @@ -934,8 +933,7 @@ 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( 'wp_enable_real_time_collaboration' ); - update_option( 'wp_enable_real_time_collaboration', true ); + add_filter( 'pre_option_wp_disable_real_time_collaboration', '__return_false' ); wp_set_current_user( self::$editor_id ); @@ -974,7 +972,7 @@ 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( 'wp_enable_real_time_collaboration', $original_option ); + remove_filter( 'pre_option_wp_disable_real_time_collaboration', '__return_false' ); } /** @@ -982,8 +980,7 @@ public function test_rest_autosave_draft_post_same_author_with_rtc() { * 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( 'wp_enable_real_time_collaboration' ); - update_option( 'wp_enable_real_time_collaboration', true ); + add_filter( 'pre_option_wp_disable_real_time_collaboration', '__return_false' ); wp_set_current_user( self::$editor_id ); $request = new WP_REST_Request( 'POST', '/wp/v2/pages/' . self::$child_draft_page_id . '/autosaves' ); @@ -1003,6 +1000,7 @@ 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( 'wp_enable_real_time_collaboration', $original_option ); + + remove_filter( 'pre_option_wp_disable_real_time_collaboration', '__return_false' ); } } diff --git a/tests/phpunit/tests/rest-api/rest-settings-controller.php b/tests/phpunit/tests/rest-api/rest-settings-controller.php index ef9e72e6a6724..57eee0a9e4c60 100644 --- 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 - 'wp_enable_real_time_collaboration', + 'wp_disable_real_time_collaboration', // Connectors API keys are registered in _wp_register_default_connector_settings() in wp-includes/connectors.php. 'connectors_ai_anthropic_api_key', 'connectors_ai_google_api_key', diff --git a/tests/phpunit/tests/rest-api/rest-sync-server.php b/tests/phpunit/tests/rest-api/rest-sync-server.php index a09b256115f48..a6a3aed3abf29 100644 --- 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( 'wp_enable_real_time_collaboration', true ); + add_filter( 'pre_option_wp_disable_real_time_collaboration', '__return_false' ); 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( 'wp_enable_real_time_collaboration' ); + remove_filter( 'pre_option_wp_disable_real_time_collaboration', '__return_false' ); } public function set_up() { diff --git a/tests/qunit/fixtures/wp-api-generated.js b/tests/qunit/fixtures/wp-api-generated.js index 487fb2067a978..f5a7d8dfe959c 100644 --- a/tests/qunit/fixtures/wp-api-generated.js +++ b/tests/qunit/fixtures/wp-api-generated.js @@ -20,7 +20,8 @@ mockedApiResponse.Schema = { "wp/v2", "wp-site-health/v1", "wp-block-editor/v1", - "wp-abilities/v1" + "wp-abilities/v1", + "wp-sync/v1" ], "authentication": { "application-passwords": { @@ -11157,9 +11158,9 @@ mockedApiResponse.Schema = { "type": "string", "required": false }, - "wp_enable_real_time_collaboration": { + "wp_disable_real_time_collaboration": { "title": "", - "description": "Enable Real-Time Collaboration", + "description": "Disable real-time collaboration", "type": "boolean", "required": false }, @@ -12770,6 +12771,114 @@ mockedApiResponse.Schema = { } } ] + }, + "/wp-sync/v1": { + "namespace": "wp-sync/v1", + "methods": [ + "GET" + ], + "endpoints": [ + { + "methods": [ + "GET" + ], + "args": { + "namespace": { + "default": "wp-sync/v1", + "required": false + }, + "context": { + "default": "view", + "required": false + } + } + } + ], + "_links": { + "self": [ + { + "href": "http://example.org/index.php?rest_route=/wp-sync/v1" + } + ] + } + }, + "/wp-sync/v1/updates": { + "namespace": "wp-sync/v1", + "methods": [ + "POST" + ], + "endpoints": [ + { + "methods": [ + "POST" + ], + "args": { + "rooms": { + "items": { + "properties": { + "after": { + "minimum": 0, + "required": true, + "type": "integer" + }, + "awareness": { + "required": true, + "type": [ + "object", + "null" + ] + }, + "client_id": { + "minimum": 1, + "required": true, + "type": "integer" + }, + "room": { + "required": true, + "type": "string", + "pattern": "^[^/]+/[^/:]+(?::\\S+)?$" + }, + "updates": { + "items": { + "properties": { + "data": { + "type": "string", + "required": true + }, + "type": { + "type": "string", + "required": true, + "enum": [ + "compaction", + "sync_step1", + "sync_step2", + "update" + ] + } + }, + "required": true, + "type": "object" + }, + "minItems": 0, + "required": true, + "type": "array" + } + }, + "type": "object" + }, + "type": "array", + "required": true + } + } + } + ], + "_links": { + "self": [ + { + "href": "http://example.org/index.php?rest_route=/wp-sync/v1/updates" + } + ] + } } }, "image_sizes": { @@ -14668,7 +14777,7 @@ mockedApiResponse.settings = { "use_smilies": true, "default_category": 1, "default_post_format": "0", - "wp_enable_real_time_collaboration": false, + "wp_disable_real_time_collaboration": false, "posts_per_page": 10, "show_on_front": "posts", "page_on_front": 0,