Collaboration: Add type_client_id index and bump db_version

Add a composite index on (type, client_id) to the collaboration table
to speed up awareness upserts, which filter on both columns.

Bump $wp_db_version from 61840 to 61841 so existing installations
pick up the schema change via dbDelta on upgrade.

Author: josephfusco

src/wp-admin/includes/schema.php

@@ -193,9 +193,10 @@ function wp_get_db_schema( $scope = 'all', $blog_id = null ) {
 	type varchar(32) NOT NULL default '',
 	client_id varchar(32) NOT NULL default '',
 	user_id bigint(20) unsigned NOT NULL default '0',
-	update_value longtext NOT NULL,
+	data longtext NOT NULL,
 	date_gmt datetime NOT NULL default '0000-00-00 00:00:00',
 	PRIMARY KEY  (id),
+	KEY type_client_id (type,client_id),
 	KEY room (room,id),
 	KEY date_gmt (date_gmt)
 ) $charset_collate;\n";

src/wp-admin/includes/upgrade.php

@@ -886,7 +886,7 @@ function upgrade_all() {
 		upgrade_682();
 	}
 
-	if ( $wp_current_db_version < 61840 ) {
+	if ( $wp_current_db_version < 61841 ) {
 		upgrade_700();
 	}
 

src/wp-includes/collaboration.php

@@ -7,52 +7,18 @@
  */
 
 /**
- * Determines whether real-time collaboration is enabled.
+ * Checks whether real-time collaboration is enabled.
  *
- * If the WP_ALLOW_COLLABORATION constant is false,
- * collaboration is always disabled regardless of the database option.
- * Otherwise, falls back to the 'wp_collaboration_enabled' option.
+ * The feature requires both the site option and the database schema
+ * introduced in db_version 61841.
  *
  * @since 7.0.0
  *
- * @return bool Whether real-time collaboration is enabled.
+ * @return bool True if collaboration is enabled, false otherwise.
  */
 function wp_is_collaboration_enabled() {
-	return (
-		wp_is_collaboration_allowed() &&
-		(bool) get_option( 'wp_collaboration_enabled' )
-	);
-}
-
-/**
- * Determines whether real-time collaboration is allowed.
- *
- * If the WP_ALLOW_COLLABORATION constant is false,
- * collaboration is not allowed and cannot be enabled.
- * The constant defaults to true, unless the WP_ALLOW_COLLABORATION
- * environment variable is set to string "false".
- *
- * @since 7.0.0
- *
- * @return bool Whether real-time collaboration is enabled.
- */
-function wp_is_collaboration_allowed() {
-	if ( ! defined( 'WP_ALLOW_COLLABORATION' ) ) {
-		$env_value = getenv( 'WP_ALLOW_COLLABORATION' );
-		if ( false === $env_value ) {
-			// Environment variable is not defined, default to allowing collaboration.
-			define( 'WP_ALLOW_COLLABORATION', true );
-		} else {
-			/*
-			 * Environment variable is defined, let's confirm it is actually set to
-			 * "true" as it may still have a string value "false" – the preceeding
-			 * `if` branch only tests for the boolean `false`.
-			 */
-			define( 'WP_ALLOW_COLLABORATION', 'true' === $env_value );
-		}
-	}
-
-	return WP_ALLOW_COLLABORATION;
+	return get_option( 'wp_enable_real_time_collaboration' )
+		&& get_option( 'db_version' ) >= 61841;
 }
 
 /**

src/wp-includes/version.php

@@ -23,7 +23,7 @@
  *
  * @global int $wp_db_version
  */
-$wp_db_version = 61840;
+$wp_db_version = 61841;
 
 /**
  * Holds the TinyMCE version.