Relocate deterministic ordering of transient.

Author: peterwilsoncc

src/wp-includes/collaboration/class-wp-http-polling-sync-server.php

@@ -365,13 +365,8 @@ private function process_awareness_update( string $room, int $client_id, ?array
 			);
 		}
 
-		wp_list_sort( $updated_awareness, 'client_id' );
-
-		// Compare old and new here to avoid function calls to set_transient/update_option.
-		if ( wp_json_encode( $updated_awareness ) !== wp_json_encode( $existing_awareness ) ) {
-			// Awareness has updated, trigger database/object cache update.
-			$this->storage->set_awareness_state( $room, $updated_awareness );
-		}
+		// This action can fail, but it shouldn't fail the entire request.
+		$this->storage->set_awareness_state( $room, $updated_awareness );
 
 		// Convert to client_id => state map for response.
 		$response = array();

src/wp-includes/collaboration/class-wp-sync-post-meta-storage.php

@@ -100,6 +100,8 @@ public function get_awareness_state( string $room ): array {
 			return array();
 		}
 
+		// Deterministic ordering of transient data.
+		$awareness = wp_list_sort( $awareness, 'client_id' );
 		return array_values( $awareness );
 	}
 
@@ -114,6 +116,8 @@ public function get_awareness_state( string $room ): array {
 	 */
 	public function set_awareness_state( string $room, array $awareness ): bool {
 		$room_hash = md5( $room ); // Not used for cryptographic purposes.
+		// Deterministic ordering of transient data.
+		$awareness = wp_list_sort( $awareness, 'client_id' );
 
 		/*
 		 * Maintain transient for longer than awareness.