WordPress
diff --git a/‎backport-changelog/7.0/11289.md‎
Lines changed: 4 additions & 0 deletions b/‎backport-changelog/7.0/11289.md‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎backport-changelog/7.0/11292.md‎
Lines changed: 3 additions & 0 deletions b/‎backport-changelog/7.0/11292.md‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎backport-changelog/7.0/11325.md‎
Lines changed: 3 additions & 0 deletions b/‎backport-changelog/7.0/11325.md‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎lib/compat/wordpress-7.0/class-gutenberg-rest-autosaves-controller.php‎
Lines changed: 1 addition & 1 deletion b/‎lib/compat/wordpress-7.0/class-gutenberg-rest-autosaves-controller.php‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎lib/compat/wordpress-7.0/class-wp-sync-post-meta-storage.php‎
Lines changed: 140 additions & 84 deletions b/‎lib/compat/wordpress-7.0/class-wp-sync-post-meta-storage.php‎
Lines changed: 140 additions & 84 deletions
@@ -0,0 +1,4 @@
+https://github.com/WordPress/wordpress-develop/pull/11289
+
+* https://github.com/WordPress/gutenberg/pull/76643
+* https://github.com/WordPress/gutenberg/pull/76736
@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/11292
+
+* https://github.com/WordPress/gutenberg/pull/76649
@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/11325
+
+* https://github.com/WordPress/gutenberg/pull/76779
@@ -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 ) {
 			/*
 
@@ -32,15 +32,15 @@ class WP_Sync_Post_Meta_Storage implements WP_Sync_Storage {
 		 * @since 7.0.0
 		 * @var string
 		 */
-		const AWARENESS_META_KEY = 'wp_sync_awareness';
+		const AWARENESS_META_KEY = 'wp_sync_awareness_state';
 
 		/**
 		 * Meta key for sync updates.
 		 *
 		 * @since 7.0.0
 		 * @var string
 		 */
-		const SYNC_UPDATE_META_KEY = 'wp_sync_update';
+		const SYNC_UPDATE_META_KEY = 'wp_sync_update_data';
 
 		/**
 		 * Cache of cursors by room.
@@ -71,75 +71,68 @@ class WP_Sync_Post_Meta_Storage implements WP_Sync_Storage {
 		 *
 		 * @since 7.0.0
 		 *
+		 * @global wpdb $wpdb WordPress database abstraction object.
+		 *
 		 * @param string $room   Room identifier.
 		 * @param mixed  $update Sync update.
 		 * @return bool True on success, false on failure.
 		 */
 		public function add_update( string $room, $update ): bool {
+			global $wpdb;
+
 			$post_id = $this->get_storage_post_id( $room );
 			if ( null === $post_id ) {
 				return false;
 			}
 
-			// Create an envelope and stamp each update to enable cursor-based filtering.
-			$envelope = array(
-				'timestamp' => $this->get_time_marker(),
-				'value'     => $update,
+			// Use direct database operation to avoid cache invalidation performed by
+			// post meta functions (`wp_cache_set_posts_last_changed()` and direct
+			// `wp_cache_delete()` calls).
+			return (bool) $wpdb->insert(
+				$wpdb->postmeta,
+				array(
+					'post_id'    => $post_id,
+					'meta_key'   => self::SYNC_UPDATE_META_KEY,
+					'meta_value' => wp_json_encode( $update ),
+				),
+				array( '%d', '%s', '%s' )
 			);
-
-			return (bool) add_post_meta( $post_id, self::SYNC_UPDATE_META_KEY, $envelope, false );
 		}
 
 		/**
-		 * Retrieves all sync updates for a given room.
+		 * Gets awareness state for a given room.
 		 *
 		 * @since 7.0.0
 		 *
+		 * @global wpdb $wpdb WordPress database abstraction object.
+		 *
 		 * @param string $room Room identifier.
-		 * @return array<int, array{ timestamp: int, value: mixed }> Sync updates.
+		 * @return array<int, mixed> Awareness state.
 		 */
-		private function get_all_updates( string $room ): array {
-			$this->room_cursors[ $room ] = $this->get_time_marker() - 100; // Small buffer to ensure consistency.
+		public function get_awareness_state( string $room ): array {
+			global $wpdb;
 
 			$post_id = $this->get_storage_post_id( $room );
 			if ( null === $post_id ) {
 				return array();
 			}
 
-			$updates = get_post_meta( $post_id, self::SYNC_UPDATE_META_KEY, false );
-
-			if ( ! is_array( $updates ) ) {
-				$updates = array();
-			}
-
-			// Filter out any updates that don't have the expected structure.
-			$updates = array_filter(
-				$updates,
-				static function ( $update ): bool {
-					return is_array( $update ) && isset( $update['timestamp'], $update['value'] ) && is_int( $update['timestamp'] );
-				}
+			// Use direct database operation to avoid updating the post meta cache.
+			// ORDER BY meta_id DESC ensures the latest row wins if duplicates exist
+			// from a past race condition in set_awareness_state().
+			$meta_value = $wpdb->get_var(
+				$wpdb->prepare(
+					"SELECT meta_value FROM $wpdb->postmeta WHERE post_id = %d AND meta_key = %s ORDER BY meta_id DESC LIMIT 1",
+					$post_id,
+					self::AWARENESS_META_KEY
+				)
 			);
 
-			$this->room_update_counts[ $room ] = count( $updates );
-
-			return $updates;
-		}
-
-		/**
-		 * Gets awareness state for a given room.
-		 *
-		 * @since 7.0.0
-		 *
-		 * @param string $room Room identifier.
-		 * @return array<int, mixed> Awareness state.
-		 */
-		public function get_awareness_state( string $room ): array {
-			$post_id = $this->get_storage_post_id( $room );
-			if ( null === $post_id ) {
+			if ( null === $meta_value ) {
 				return array();
 			}
 
-			$awareness = get_post_meta( $post_id, self::AWARENESS_META_KEY, true );
+			$awareness = json_decode( $meta_value, true );
 
 			if ( ! is_array( $awareness ) ) {
 				return array();
@@ -153,27 +146,61 @@ public function get_awareness_state( string $room ): array {
 		 *
 		 * @since 7.0.0
 		 *
+		 * @global wpdb $wpdb WordPress database abstraction object.
+		 *
 		 * @param string            $room      Room identifier.
 		 * @param array<int, mixed> $awareness Serializable awareness state.
 		 * @return bool True on success, false on failure.
 		 */
 		public function set_awareness_state( string $room, array $awareness ): bool {
+			global $wpdb;
+
 			$post_id = $this->get_storage_post_id( $room );
 			if ( null === $post_id ) {
 				return false;
 			}
 
-			// update_post_meta returns false if the value is the same as the existing value.
-			update_post_meta( $post_id, self::AWARENESS_META_KEY, $awareness );
-			return true;
+			// Use direct database operation to avoid cache invalidation performed by
+			// post meta functions (`wp_cache_set_posts_last_changed()` and direct
+			// `wp_cache_delete()` calls).
+			//
+			// If two concurrent requests both see no row and both INSERT, the
+			// duplicate is harmless: get_awareness_state() reads the latest row
+			// (ORDER BY meta_id DESC).
+			$meta_id = $wpdb->get_var(
+				$wpdb->prepare(
+					"SELECT meta_id FROM $wpdb->postmeta WHERE post_id = %d AND meta_key = %s ORDER BY meta_id DESC LIMIT 1",
+					$post_id,
+					self::AWARENESS_META_KEY
+				)
+			);
+
+			if ( $meta_id ) {
+				return (bool) $wpdb->update(
+					$wpdb->postmeta,
+					array( 'meta_value' => wp_json_encode( $awareness ) ),
+					array( 'meta_id' => $meta_id ),
+					array( '%s' ),
+					array( '%d' )
+				);
+			}
+
+			return (bool) $wpdb->insert(
+				$wpdb->postmeta,
+				array(
+					'post_id'    => $post_id,
+					'meta_key'   => self::AWARENESS_META_KEY,
+					'meta_value' => wp_json_encode( $awareness ),
+				),
+				array( '%d', '%s', '%s' )
+			);
 		}
 
 		/**
 		 * Gets the current cursor for a given room.
 		 *
 		 * The cursor is set during get_updates_after_cursor() and represents the
-		 * point in time just before the updates were retrieved, with a small buffer
-		 * to ensure consistency.
+		 * highest meta_id seen for the room's sync updates.
 		 *
 		 * @since 7.0.0
 		 *
@@ -210,6 +237,8 @@ private function get_storage_post_id( string $room ): ?int {
 					'post_status'    => 'publish',
 					'name'           => $room_hash,
 					'fields'         => 'ids',
+					'orderby'        => 'ID',
+					'order'          => 'ASC',
 				)
 			);
 
@@ -243,17 +272,6 @@ private function get_storage_post_id( string $room ): ?int {
 			return null;
 		}
 
-		/**
-		 * Gets the current time in milliseconds as a comparable time marker.
-		 *
-		 * @since 7.0.0
-		 *
-		 * @return int Current time in milliseconds.
-		 */
-		private function get_time_marker(): int {
-			return (int) floor( microtime( true ) * 1000 );
-		}
-
 		/**
 		 * Gets the number of updates stored for a given room.
 		 *
@@ -267,65 +285,103 @@ public function get_update_count( string $room ): int {
 		}
 
 		/**
-		 * Retrieves sync updates from a room for a given client and cursor. Updates
-		 * from the specified client should be excluded.
+		 * Retrieves sync updates from a room after the given cursor.
 		 *
 		 * @since 7.0.0
 		 *
+		 * @global wpdb $wpdb WordPress database abstraction object.
+		 *
 		 * @param string $room   Room identifier.
-		 * @param int    $cursor Return updates after this cursor.
+		 * @param int    $cursor Return updates after this cursor (meta_id).
 		 * @return array<int, mixed> Sync updates.
 		 */
 		public function get_updates_after_cursor( string $room, int $cursor ): array {
-			$all_updates = $this->get_all_updates( $room );
-			$updates     = array();
+			global $wpdb;
 
-			foreach ( $all_updates as $update ) {
-				if ( $update['timestamp'] > $cursor ) {
-					$updates[] = $update;
-				}
+			$post_id = $this->get_storage_post_id( $room );
+			if ( null === $post_id ) {
+				$this->room_cursors[ $room ]       = 0;
+				$this->room_update_counts[ $room ] = 0;
+				return array();
 			}
 
-			// Sort by timestamp to ensure order.
-			usort(
-				$updates,
-				fn ( $a, $b ) => $a['timestamp'] <=> $b['timestamp']
+			// Capture the current room state first so the returned cursor is race-safe.
+			$stats = $wpdb->get_row(
+				$wpdb->prepare(
+					"SELECT COUNT(*) AS total_updates, COALESCE( MAX(meta_id), 0 ) AS max_meta_id FROM {$wpdb->postmeta} WHERE post_id = %d AND meta_key = %s",
+					$post_id,
+					self::SYNC_UPDATE_META_KEY
+				)
 			);
 
-			return wp_list_pluck( $updates, 'value' );
+			$total_updates = $stats ? (int) $stats->total_updates : 0;
+			$max_meta_id   = $stats ? (int) $stats->max_meta_id : 0;
+
+			$this->room_update_counts[ $room ] = $total_updates;
+			$this->room_cursors[ $room ]       = $max_meta_id;
+
+			if ( $max_meta_id <= $cursor ) {
+				return array();
+			}
+
+			$rows = $wpdb->get_results(
+				$wpdb->prepare(
+					"SELECT meta_value FROM {$wpdb->postmeta} WHERE post_id = %d AND meta_key = %s AND meta_id > %d AND meta_id <= %d ORDER BY meta_id ASC",
+					$post_id,
+					self::SYNC_UPDATE_META_KEY,
+					$cursor,
+					$max_meta_id
+				)
+			);
+
+			if ( ! $rows ) {
+				return array();
+			}
+
+			$updates = array();
+			foreach ( $rows as $row ) {
+				$decoded = json_decode( $row->meta_value, true );
+				if ( null !== $decoded ) {
+					$updates[] = $decoded;
+				}
+			}
+
+			return $updates;
 		}
 
 		/**
 		 * Removes updates from a room that are older than the given cursor.
 		 *
 		 * @since 7.0.0
 		 *
+		 * @global wpdb $wpdb WordPress database abstraction object.
+		 *
 		 * @param string $room   Room identifier.
-		 * @param int    $cursor Remove updates with markers < this cursor.
+		 * @param int    $cursor Remove updates with meta_id < this cursor.
 		 * @return bool True on success, false on failure.
 		 */
 		public function remove_updates_before_cursor( string $room, int $cursor ): bool {
+			global $wpdb;
+
 			$post_id = $this->get_storage_post_id( $room );
 			if ( null === $post_id ) {
 				return false;
 			}
 
-			$all_updates = $this->get_all_updates( $room );
+			$deleted_rows = $wpdb->query(
+				$wpdb->prepare(
+					"DELETE FROM {$wpdb->postmeta} WHERE post_id = %d AND meta_key = %s AND meta_id < %d",
+					$post_id,
+					self::SYNC_UPDATE_META_KEY,
+					$cursor
+				)
+			);
 
-			// Remove all updates for the room and re-store only those that are newer than the cursor.
-			if ( ! delete_post_meta( $post_id, self::SYNC_UPDATE_META_KEY ) ) {
+			if ( false === $deleted_rows ) {
 				return false;
 			}
 
-			// Re-store envelopes directly to avoid double-wrapping by add_update().
-			$add_result = true;
-			foreach ( $all_updates as $envelope ) {
-				if ( $add_result && $envelope['timestamp'] >= $cursor ) {
-					$add_result = (bool) add_post_meta( $post_id, self::SYNC_UPDATE_META_KEY, $envelope, false );
-				}
-			}
-
-			return $add_result;
+			return true;
 		}
 	}
 }
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+https://github.com/WordPress/wordpress-develop/pull/11292`
	`2`	`+`
	`3`	`+* https://github.com/WordPress/gutenberg/pull/76649`