Merge branch 'trunk' of https://github.com/WordPress/wordpress-develop into trac-64404

westonruter · westonruter · commit d023b9a4e6e3 · 2025-12-14T14:30:13.000-08:00
diff --git a/src/js/_enqueues/lib/auth-check.js b/src/js/_enqueues/lib/auth-check.js
@@ -159,12 +159,23 @@
 			setShowTimeout();
 		});
 	}).on( 'heartbeat-tick.wp-auth-check', function( e, data ) {
-		if ( 'wp-auth-check' in data ) {
+		if ( ! ( 'wp-auth-check' in data ) ) {
+			return;
+		}
+
+		var showOrHide = function () {
 			if ( ! data['wp-auth-check'] && wrap.hasClass( 'hidden' ) && ! tempHidden ) {
 				show();
 			} else if ( data['wp-auth-check'] && ! wrap.hasClass( 'hidden' ) ) {
 				hide();
 			}
+		};
+
+		// This is necessary due to a race condition where the heartbeat-tick event may fire before DOMContentLoaded.
+		if ( wrap ) {
+			showOrHide();
+		} else {
+			$( showOrHide );
 		}
 	});
 
diff --git a/src/wp-admin/includes/class-wp-ms-sites-list-table.php b/src/wp-admin/includes/class-wp-ms-sites-list-table.php
@@ -674,6 +674,7 @@ protected function site_states( $site ) {
 
 		if ( ! empty( $site_states ) ) {
 			$state_count = count( $site_states );
+			$separator   = wp_get_list_item_separator();
 
 			$i = 0;
 
@@ -682,9 +683,9 @@ protected function site_states( $site ) {
 			foreach ( $site_states as $state ) {
 				++$i;
 
-				$separator = ( $i < $state_count ) ? ', ' : '';
+				$suffix = ( $i < $state_count ) ? $separator : '';
 
-				echo "<span class='post-state'>{$state}{$separator}</span>";
+				echo "<span class='post-state'>{$state}{$suffix}</span>";
 			}
 		}
 	}
diff --git a/src/wp-admin/includes/file.php b/src/wp-admin/includes/file.php
@@ -1896,14 +1896,14 @@ function _unzip_file_pclzip( $file, $to, $needed_dirs = array() ) {
 	$uncompressed_size = 0;
 
 	// Determine any children directories needed (From within the archive).
-	foreach ( $archive_files as $file ) {
-		if ( str_starts_with( $file['filename'], '__MACOSX/' ) ) { // Skip the OS X-created __MACOSX directory.
+	foreach ( $archive_files as $archive_file ) {
+		if ( str_starts_with( $archive_file['filename'], '__MACOSX/' ) ) { // Skip the OS X-created __MACOSX directory.
 			continue;
 		}
 
-		$uncompressed_size += $file['size'];
+		$uncompressed_size += $archive_file['size'];
 
-		$needed_dirs[] = $to . untrailingslashit( $file['folder'] ? $file['filename'] : dirname( $file['filename'] ) );
+		$needed_dirs[] = $to . untrailingslashit( $archive_file['folder'] ? $archive_file['filename'] : dirname( $archive_file['filename'] ) );
 	}
 
 	// Enough space to unzip the file and copy its contents, with a 10% buffer.
@@ -1967,22 +1967,22 @@ function _unzip_file_pclzip( $file, $to, $needed_dirs = array() ) {
 	}
 
 	// Extract the files from the zip.
-	foreach ( $archive_files as $file ) {
-		if ( $file['folder'] ) {
+	foreach ( $archive_files as $archive_file ) {
+		if ( $archive_file['folder'] ) {
 			continue;
 		}
 
-		if ( str_starts_with( $file['filename'], '__MACOSX/' ) ) { // Don't extract the OS X-created __MACOSX directory files.
+		if ( str_starts_with( $archive_file['filename'], '__MACOSX/' ) ) { // Don't extract the OS X-created __MACOSX directory files.
 			continue;
 		}
 
 		// Don't extract invalid files:
-		if ( 0 !== validate_file( $file['filename'] ) ) {
+		if ( 0 !== validate_file( $archive_file['filename'] ) ) {
 			continue;
 		}
 
-		if ( ! $wp_filesystem->put_contents( $to . $file['filename'], $file['content'], FS_CHMOD_FILE ) ) {
-			return new WP_Error( 'copy_failed_pclzip', __( 'Could not copy file.' ), $file['filename'] );
+		if ( ! $wp_filesystem->put_contents( $to . $archive_file['filename'], $archive_file['content'], FS_CHMOD_FILE ) ) {
+			return new WP_Error( 'copy_failed_pclzip', __( 'Could not copy file.' ), $archive_file['filename'] );
 		}
 	}
 
diff --git a/src/wp-admin/includes/template.php b/src/wp-admin/includes/template.php
@@ -2251,6 +2251,7 @@ function _post_states( $post, $display = true ) {
 
 	if ( ! empty( $post_states ) ) {
 		$state_count = count( $post_states );
+		$separator   = wp_get_list_item_separator();
 
 		$i = 0;
 
@@ -2259,9 +2260,9 @@ function _post_states( $post, $display = true ) {
 		foreach ( $post_states as $state ) {
 			++$i;
 
-			$separator = ( $i < $state_count ) ? ', ' : '';
+			$suffix = ( $i < $state_count ) ? $separator : '';
 
-			$post_states_html .= "<span class='post-state'>{$state}{$separator}</span>";
+			$post_states_html .= "<span class='post-state'>{$state}{$suffix}</span>";
 		}
 	}
 
@@ -2379,6 +2380,7 @@ function _media_states( $post, $display = true ) {
 
 	if ( ! empty( $media_states ) ) {
 		$state_count = count( $media_states );
+		$separator   = wp_get_list_item_separator();
 
 		$i = 0;
 
@@ -2387,9 +2389,9 @@ function _media_states( $post, $display = true ) {
 		foreach ( $media_states as $state ) {
 			++$i;
 
-			$separator = ( $i < $state_count ) ? ', ' : '';
+			$suffix = ( $i < $state_count ) ? $separator : '';
 
-			$media_states_string .= "<span class='post-state'>{$state}{$separator}</span>";
+			$media_states_string .= "<span class='post-state'>{$state}{$suffix}</span>";
 		}
 	}
 
diff --git a/src/wp-includes/revision.php b/src/wp-includes/revision.php
@@ -187,7 +187,7 @@ function wp_save_post_revision( $post_id ) {
 			$post_has_changed = false;
 
 			foreach ( array_keys( _wp_post_revision_fields( $post ) ) as $field ) {
-				if ( normalize_whitespace( $post->$field ) !== normalize_whitespace( $latest_revision->$field ) ) {
+				if ( normalize_whitespace( maybe_serialize( $post->$field ) ) !== normalize_whitespace( maybe_serialize( $latest_revision->$field ) ) ) {
 					$post_has_changed = true;
 					break;
 				}
diff --git a/src/wp-includes/taxonomy.php b/src/wp-includes/taxonomy.php
@@ -1999,6 +1999,10 @@ function wp_delete_object_term_relationships( $object_id, $taxonomies ) {
 
 	foreach ( (array) $taxonomies as $taxonomy ) {
 		$term_ids = wp_get_object_terms( $object_id, $taxonomy, array( 'fields' => 'ids' ) );
+		if ( ! is_array( $term_ids ) ) {
+			// Skip return value in the case of an error or the 'wp_get_object_terms' filter returning an invalid value.
+			continue;
+		}
 		$term_ids = array_map( 'intval', $term_ids );
 		wp_remove_object_terms( $object_id, $term_ids, $taxonomy );
 	}
diff --git a/tests/phpunit/tests/filesystem/unzipFilePclzip.php b/tests/phpunit/tests/filesystem/unzipFilePclzip.php
@@ -37,7 +37,7 @@ public static function set_up_before_class() {
 	 */
 	public function test_should_apply_pre_unzip_file_filters() {
 		$filter = new MockAction();
-		add_filter( 'pre_unzip_file', array( $filter, 'filter' ) );
+		add_filter( 'pre_unzip_file', array( $filter, 'filter' ), 10, 2 );
 
 		// Prepare test environment.
 		$unzip_destination = self::$test_data_dir . 'archive/';
@@ -53,7 +53,8 @@ public function test_should_apply_pre_unzip_file_filters() {
 		$this->rmdir( $unzip_destination );
 		$this->delete_folders( $unzip_destination );
 
-		$this->assertSame( 1, $filter->get_call_count() );
+		$this->assertSame( 1, $filter->get_call_count(), 'The filter should be called once.' );
+		$this->assertSame( self::$test_data_dir . 'archive.zip', $filter->get_args()[0][1], 'The $file parameter should be correct.' );
 	}
 
 	/**
@@ -63,7 +64,7 @@ public function test_should_apply_pre_unzip_file_filters() {
 	 */
 	public function test_should_apply_unzip_file_filters() {
 		$filter = new MockAction();
-		add_filter( 'unzip_file', array( $filter, 'filter' ) );
+		add_filter( 'unzip_file', array( $filter, 'filter' ), 10, 2 );
 
 		// Prepare test environment.
 		$unzip_destination = self::$test_data_dir . 'archive/';
@@ -79,6 +80,7 @@ public function test_should_apply_unzip_file_filters() {
 		$this->rmdir( $unzip_destination );
 		$this->delete_folders( $unzip_destination );
 
-		$this->assertSame( 1, $filter->get_call_count() );
+		$this->assertSame( 1, $filter->get_call_count(), 'The filter should be called once.' );
+		$this->assertSame( self::$test_data_dir . 'archive.zip', $filter->get_args()[0][1], 'The $file parameter should be correct.' );
 	}
 }
diff --git a/tests/phpunit/tests/menu/wpAjaxMenuQuickSearch.php b/tests/phpunit/tests/menu/wpAjaxMenuQuickSearch.php
@@ -192,6 +192,6 @@ public function test_search_returns_post_types_with_numeric_slugs() {
 		$this->assertCount( 1, $results );
 
 		$results_json = array_map( 'json_decode', $results );
-		$this->assertEquals( 'wptests_123', $results_json[0]->post_type );
+		$this->assertSame( 'wptests_123', $results_json[0]->post_type );
 	}
 }
diff --git a/tests/phpunit/tests/pluggable/wpMail.php b/tests/phpunit/tests/pluggable/wpMail.php
@@ -666,12 +666,12 @@ public function test_wp_mail_encoding_does_not_bleed() {
 		wp_mail( WP_TESTS_EMAIL, 'Looong line testing', $content );
 
 		$mailer = tests_retrieve_phpmailer_instance();
-		$this->assertEquals( 'quoted-printable', $mailer->Encoding );
+		$this->assertSame( 'quoted-printable', $mailer->Encoding );
 
 		wp_mail( WP_TESTS_EMAIL, 'A follow up short email', 'Short email' );
 
 		$mailer = tests_retrieve_phpmailer_instance();
-		$this->assertEquals( '7bit', $mailer->Encoding );
+		$this->assertSame( '7bit', $mailer->Encoding );
 	}
 
 	/**
diff --git a/tests/phpunit/tests/post/revisions.php b/tests/phpunit/tests/post/revisions.php
@@ -930,4 +930,63 @@ static function ( $revisions ) {
 			'The title of the second revision was incorrect.'
 		);
 	}
+
+	/**
+	 * @ticket 64314
+	 * @covers ::wp_save_post_revision
+	 */
+	public function test_wp_save_post_revision_with_array_post_meta() {
+		// This filter is true by default, but this is explicitly to test looking for differences among non-scalar fields.
+		add_filter( 'wp_save_post_revision_check_for_changes', '__return_true' );
+
+		$post_id  = self::factory()->post->create();
+		$meta_key = 'favorite_things';
+
+		// Ensure the post meta is saved with each revision.
+		add_filter(
+			'wp_post_revision_meta_keys',
+			static function ( $meta_keys ) use ( $meta_key ) {
+				$meta_keys[] = $meta_key;
+				return $meta_keys;
+			}
+		);
+
+		// Ensure the post meta are used when determining whether a revision should be saved.
+		add_filter(
+			'_wp_post_revision_fields',
+			static function ( $fields ) use ( $meta_key ) {
+				$fields[ $meta_key ] = 'Favorite Things';
+				return $fields;
+			}
+		);
+
+		// Set initial value.
+		$initial_favorites = array(
+			'raindrops on roses',
+			'whiskers on kittens',
+			'bright copper kettles',
+		);
+		update_post_meta( $post_id, $meta_key, $initial_favorites );
+
+		// Save the first revision.
+		$revision_id_1 = wp_save_post_revision( $post_id );
+		$this->assertIsInt( $revision_id_1, 'Expected first revision to be created.' );
+		$this->assertCount( 1, wp_get_post_revisions( $post_id ), 'First revision should be created.' );
+		$this->assertSame( $initial_favorites, get_post_meta( $revision_id_1, $meta_key, true ), 'Expected first revision post meta to have the initial value.' );
+
+		// Save the second revision.
+		$updated_favorites = array_merge(
+			$initial_favorites,
+			array(
+				'warm woolen mittens',
+				'crisp apple strudels',
+				'brown paper packages tied up with strings',
+			)
+		);
+		update_post_meta( $post_id, $meta_key, $updated_favorites );
+		$revision_id_2 = wp_save_post_revision( $post_id );
+		$this->assertIsInt( $revision_id_2, 'Expected second revision to be created.' );
+		$this->assertCount( 2, wp_get_post_revisions( $post_id ), 'Second revision should be created after array field change.' );
+		$this->assertSame( $updated_favorites, get_post_meta( $revision_id_2, $meta_key, true ), 'Expected second revision post meta to have the updated value.' );
+	}
 }
diff --git a/tests/phpunit/tests/rest-api/wpRestAbilitiesV1CategoriesController.php b/tests/phpunit/tests/rest-api/wpRestAbilitiesV1CategoriesController.php
@@ -171,9 +171,9 @@ public function test_get_item(): void {
 		$this->assertEquals( 200, $response->get_status() );
 
 		$data = $response->get_data();
-		$this->assertEquals( 'test-data-retrieval', $data['slug'] );
-		$this->assertEquals( 'Data Retrieval', $data['label'] );
-		$this->assertEquals( 'Abilities that retrieve and return data from the WordPress site.', $data['description'] );
+		$this->assertSame( 'test-data-retrieval', $data['slug'] );
+		$this->assertSame( 'Data Retrieval', $data['label'] );
+		$this->assertSame( 'Abilities that retrieve and return data from the WordPress site.', $data['description'] );
 		$this->assertArrayHasKey( 'meta', $data );
 	}
 
@@ -189,10 +189,10 @@ public function test_get_item_with_meta(): void {
 		$this->assertEquals( 200, $response->get_status() );
 
 		$data = $response->get_data();
-		$this->assertEquals( 'test-communication', $data['slug'] );
+		$this->assertSame( 'test-communication', $data['slug'] );
 		$this->assertArrayHasKey( 'meta', $data );
 		$this->assertIsArray( $data['meta'] );
-		$this->assertEquals( 'high', $data['meta']['priority'] );
+		$this->assertSame( 'high', $data['meta']['priority'] );
 	}
 
 	/**
@@ -212,8 +212,8 @@ public function test_get_item_with_selected_fields(): void {
 
 		$data = $response->get_data();
 		$this->assertCount( 2, $data, 'Response should only contain the requested fields.' );
-		$this->assertEquals( 'test-data-retrieval', $data['slug'] );
-		$this->assertEquals( 'Data Retrieval', $data['label'] );
+		$this->assertSame( 'test-data-retrieval', $data['slug'] );
+		$this->assertSame( 'Data Retrieval', $data['label'] );
 	}
 
 	/**
@@ -230,7 +230,7 @@ public function test_get_item_not_found(): void {
 		$this->assertEquals( 404, $response->get_status() );
 
 		$data = $response->get_data();
-		$this->assertEquals( 'rest_ability_category_not_found', $data['code'] );
+		$this->assertSame( 'rest_ability_category_not_found', $data['code'] );
 	}
 
 	/**
@@ -424,8 +424,8 @@ public function test_get_schema(): void {
 		$this->assertArrayHasKey( 'schema', $data );
 		$schema = $data['schema'];
 
-		$this->assertEquals( 'ability-category', $schema['title'] );
-		$this->assertEquals( 'object', $schema['type'] );
+		$this->assertSame( 'ability-category', $schema['title'] );
+		$this->assertSame( 'object', $schema['type'] );
 		$this->assertArrayHasKey( 'properties', $schema );
 
 		$properties = $schema['properties'];
@@ -438,7 +438,7 @@ public function test_get_schema(): void {
 		$this->assertArrayHasKey( 'meta', $properties );
 
 		$slug_property = $properties['slug'];
-		$this->assertEquals( 'string', $slug_property['type'] );
+		$this->assertSame( 'string', $slug_property['type'] );
 		$this->assertTrue( $slug_property['readonly'] );
 	}
 
diff --git a/tests/phpunit/tests/rest-api/wpRestAbilitiesV1ListController.php b/tests/phpunit/tests/rest-api/wpRestAbilitiesV1ListController.php
diff --git a/tests/phpunit/tests/rest-api/wpRestAbilitiesV1RunController.php b/tests/phpunit/tests/rest-api/wpRestAbilitiesV1RunController.php
diff --git a/tests/phpunit/tests/rest-api/wpRestUrlDetailsController.php b/tests/phpunit/tests/rest-api/wpRestUrlDetailsController.php
diff --git a/tests/phpunit/tests/term/wpDeleteObjectTermRelationships.php b/tests/phpunit/tests/term/wpDeleteObjectTermRelationships.php

Original file line number	Diff line number	Diff line change
`@@ -674,6 +674,7 @@ protected function site_states( $site ) {`
`674`	`674`
`675`	`675`	`if ( ! empty( $site_states ) ) {`
`676`	`676`	`$state_count = count( $site_states );`
	`677`	`+ $separator = wp_get_list_item_separator();`
`677`	`678`
`678`	`679`	`$i = 0;`
`679`	`680`
`@@ -682,9 +683,9 @@ protected function site_states( $site ) {`
`682`	`683`	`foreach ( $site_states as $state ) {`
`683`	`684`	`++$i;`
`684`	`685`
`685`		`- $separator = ( $i < $state_count ) ? ', ' : '';`
	`686`	`+ $suffix = ( $i < $state_count ) ? $separator : '';`
`686`	`687`
`687`		`- echo "<span class='post-state'>{$state}{$separator}</span>";`
	`688`	`+ echo "<span class='post-state'>{$state}{$suffix}</span>";`
`688`	`689`	`}`
`689`	`690`	`}`
`690`	`691`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1896,14 +1896,14 @@ function _unzip_file_pclzip( $file, $to, $needed_dirs = array() ) {`
`1896`	`1896`	`$uncompressed_size = 0;`
`1897`	`1897`
`1898`	`1898`	`// Determine any children directories needed (From within the archive).`
`1899`		`- foreach ( $archive_files as $file ) {`
`1900`		`- if ( str_starts_with( $file['filename'], '__MACOSX/' ) ) { // Skip the OS X-created __MACOSX directory.`
	`1899`	`+ foreach ( $archive_files as $archive_file ) {`
	`1900`	`+ if ( str_starts_with( $archive_file['filename'], '__MACOSX/' ) ) { // Skip the OS X-created __MACOSX directory.`
`1901`	`1901`	`continue;`
`1902`	`1902`	`}`
`1903`	`1903`
`1904`		`- $uncompressed_size += $file['size'];`
	`1904`	`+ $uncompressed_size += $archive_file['size'];`
`1905`	`1905`
`1906`		`- $needed_dirs[] = $to . untrailingslashit( $file['folder'] ? $file['filename'] : dirname( $file['filename'] ) );`
	`1906`	`+ $needed_dirs[] = $to . untrailingslashit( $archive_file['folder'] ? $archive_file['filename'] : dirname( $archive_file['filename'] ) );`
`1907`	`1907`	`}`
`1908`	`1908`
`1909`	`1909`	`// Enough space to unzip the file and copy its contents, with a 10% buffer.`
`@@ -1967,22 +1967,22 @@ function _unzip_file_pclzip( $file, $to, $needed_dirs = array() ) {`
`1967`	`1967`	`}`
`1968`	`1968`
`1969`	`1969`	`// Extract the files from the zip.`
`1970`		`- foreach ( $archive_files as $file ) {`
`1971`		`- if ( $file['folder'] ) {`
	`1970`	`+ foreach ( $archive_files as $archive_file ) {`
	`1971`	`+ if ( $archive_file['folder'] ) {`
`1972`	`1972`	`continue;`
`1973`	`1973`	`}`
`1974`	`1974`
`1975`		`- if ( str_starts_with( $file['filename'], '__MACOSX/' ) ) { // Don't extract the OS X-created __MACOSX directory files.`
	`1975`	`+ if ( str_starts_with( $archive_file['filename'], '__MACOSX/' ) ) { // Don't extract the OS X-created __MACOSX directory files.`
`1976`	`1976`	`continue;`
`1977`	`1977`	`}`
`1978`	`1978`
`1979`	`1979`	`// Don't extract invalid files:`
`1980`		`- if ( 0 !== validate_file( $file['filename'] ) ) {`
	`1980`	`+ if ( 0 !== validate_file( $archive_file['filename'] ) ) {`
`1981`	`1981`	`continue;`
`1982`	`1982`	`}`
`1983`	`1983`
`1984`		`- if ( ! $wp_filesystem->put_contents( $to . $file['filename'], $file['content'], FS_CHMOD_FILE ) ) {`
`1985`		`- return new WP_Error( 'copy_failed_pclzip', __( 'Could not copy file.' ), $file['filename'] );`
	`1984`	`+ if ( ! $wp_filesystem->put_contents( $to . $archive_file['filename'], $archive_file['content'], FS_CHMOD_FILE ) ) {`
	`1985`	`+ return new WP_Error( 'copy_failed_pclzip', __( 'Could not copy file.' ), $archive_file['filename'] );`
`1986`	`1986`	`}`
`1987`	`1987`	`}`
`1988`	`1988`
Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ function wp_save_post_revision( $post_id ) {`
`187`	`187`	`$post_has_changed = false;`
`188`	`188`
`189`	`189`	`foreach ( array_keys( _wp_post_revision_fields( $post ) ) as $field ) {`
`190`		`- if ( normalize_whitespace( $post->$field ) !== normalize_whitespace( $latest_revision->$field ) ) {`
	`190`	`+ if ( normalize_whitespace( maybe_serialize( $post->$field ) ) !== normalize_whitespace( maybe_serialize( $latest_revision->$field ) ) ) {`
`191`	`191`	`$post_has_changed = true;`
`192`	`192`	`break;`
`193`	`193`	`}`
Original file line number	Diff line number	Diff line change
`@@ -192,6 +192,6 @@ public function test_search_returns_post_types_with_numeric_slugs() {`
`192`	`192`	`$this->assertCount( 1, $results );`
`193`	`193`
`194`	`194`	`$results_json = array_map( 'json_decode', $results );`
`195`		`- $this->assertEquals( 'wptests_123', $results_json[0]->post_type );`
	`195`	`+ $this->assertSame( 'wptests_123', $results_json[0]->post_type );`
`196`	`196`	`}`
`197`	`197`	`}`