Fix: Media search not working

Author: burhandodhy

includes/classes/Feature/ProtectedContent/ProtectedContent.php

@@ -464,8 +464,8 @@ public function maybe_change_sort( $default_sort ) {
 	 * @return array
 	 */
 	public function filter_private_posts_for_current_user( $formatted_args, $args ): array {
-		$post_types = (array) $args['post_type'];
-
+		$post_types       = (array) $args['post_type'];
+		$post_statuses    = (array) ( is_string( $args['post_status'] ) ? explode( ',', $args['post_status'] ) : $args['post_status'] );
 		$valid_post_types = array_filter( $post_types, 'post_type_exists' );
 
 		$base_statuses = array_merge(
@@ -476,8 +476,9 @@ public function filter_private_posts_for_current_user( $formatted_args, $args ):
 					'show_in_admin_all_list' => true,
 				]
 			),
-			! empty( $args['post_status'] ) ? (array) $args['post_status'] : []
+			$post_statuses
 		);
+		$base_statuses = array_unique( $base_statuses );
 
 		$post_types_with_capability    = [];
 		$post_types_without_capability = [];
@@ -502,6 +503,7 @@ public function filter_private_posts_for_current_user( $formatted_args, $args ):
 
 		if ( ! empty( $post_types_with_capability ) ) {
 			$all_statuses = array_merge( $base_statuses, get_post_stati( [ 'private' => true ] ) );
+			$all_statuses = array_unique( $all_statuses );
 
 			$should_clauses[] = [
 				'bool' => [

tests/e2e/src/specs/protected-content.spec.ts

@@ -69,6 +69,26 @@ test.describe('Protected Content Feature', { tag: '@group1' }, () => {
 		await expect(results.hits.total.value).toBe(1);
 	});
 
+	test('Can use Elasticsearch in the Media Library Admin Screen', async ({ loggedInPage }) => {
+		await maybeEnableFeature('protected_content');
+		await goToAdminPage(loggedInPage, 'upload.php?mode=list');
+		await expect(
+			loggedInPage.locator('#debug-menu-target-EP_Debug_Bar_ElasticPress'),
+		).toContainText('Time Taken');
+
+		// Check there are some rows in the list
+		const initialRows = loggedInPage.locator('#the-list tr');
+		await expect(initialRows.count()).resolves.toBeGreaterThan(0);
+
+		await loggedInPage.locator('#media-search-input').fill('woocommerce-placeholder');
+		await loggedInPage.locator('#media-search-input').press('Enter');
+
+		// Wait for search results and verify exactly 1 row
+		await loggedInPage.waitForLoadState('networkidle');
+		const rows = loggedInPage.locator('#the-list tr');
+		await expect(rows).toHaveCount(1);
+	});
+
 	test('Can sync autosaved drafts', async ({ loggedInPage }) => {
 		await maybeEnableFeature('protected_content');
 

tests/php/features/TestProtectedContent.php

@@ -623,4 +623,61 @@ public function test_post_statuses_for_admin() {
 		$this->assertContains( 'pending', $statuses );
 		$this->assertContains( 'private', $statuses );
 	}
+
+	/**
+	 * Tests post statuses for admin with multiple statuses.
+	 *
+	 * @since 5.3.2
+	 * @group protected-content
+	 */
+	public function test_post_statuses_for_admin_with_multiple_statuses() {
+		set_current_screen( 'edit.php' );
+		$this->assertTrue( is_admin() );
+
+		ElasticPress\Features::factory()->activate_feature( 'protected_content' );
+		ElasticPress\Features::factory()->setup_features();
+
+		$post_1_id = $this->ep_factory->post->create(
+			[
+				'post_status' => 'inherit',
+			]
+		);
+		$post_2_id = $this->ep_factory->post->create(
+			[
+				'post_status' => 'private',
+			]
+		);
+		$this->ep_factory->post->create(
+			[
+				'post_status' => 'draft',
+			]
+		);
+
+		ElasticPress\Elasticsearch::factory()->refresh_indices();
+
+		$query = new \WP_Query(
+			[
+				'post_status'  => 'inherit,private',
+				'ep_integrate' => true,
+				'orderby'      => 'date',
+			]
+		);
+
+		$this->assertTrue( $query->elasticsearch_success );
+		$this->assertEquals( 2, $query->found_posts );
+		$this->assertEquals( $post_1_id, $query->posts[0]->ID );
+		$this->assertEquals( $post_2_id, $query->posts[1]->ID );
+
+		$query = new \WP_Query(
+			[
+				'post_status'  => [ 'inherit', 'private' ],
+				'ep_integrate' => true,
+				'orderby'      => 'date',
+			]
+		);
+		$this->assertTrue( $query->elasticsearch_success );
+		$this->assertEquals( 2, $query->found_posts );
+		$this->assertEquals( $post_1_id, $query->posts[0]->ID );
+		$this->assertEquals( $post_2_id, $query->posts[1]->ID );
+	}
 }