Merge pull request #3271 from 10up/fix/3226-meta-query

Sanitize meta query
10up · Feb 8, 2023 · 2da59bb · 2da59bb
2 parents 00f73e4 + f4c28ff
commit 2da59bb
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 0 deletions.
diff --git a/includes/classes/Indexable/Post/Post.php b/includes/classes/Indexable/Post/Post.php
@@ -2050,6 +2050,7 @@ protected function parse_meta_queries( $args ) {
 		 * @since 1.3
 		 */
 		$meta_queries = ( ! empty( $args['meta_query'] ) ) ? $args['meta_query'] : [];
+		$meta_queries = ( new \WP_Meta_Query() )->sanitize_query( $meta_queries );
 
 		/**
 		 * Todo: Support meta_type

diff --git a/tests/php/indexables/TestPost.php b/tests/php/indexables/TestPost.php
@@ -3231,6 +3231,48 @@ public function testMetaQueryAdvanced() {
 		$this->assertEquals( 1, $query->found_posts );
 	}
 
+	/**
+	 * Test the sanitization of an empty meta query
+	 *
+	 * @since 4.5.0
+	 * @group post
+	 */
+	public function testMetaQueryEmptySanitization() {
+		$this->ep_factory->post->create(
+			array(
+				'post_content' => 'the post content findme',
+				'meta_input'   => array(
+					'test_key'  => 'value1',
+					'test_key2' => 'value',
+				),
+			)
+		);
+		$this->ep_factory->post->create(
+			array(
+				'post_content' => 'post content findme',
+				'meta_input'   => array(
+					'test_key'  => 'value',
+					'test_key2' => 'value2',
+					'test_key3' => 'value',
+				),
+			)
+		);
+
+		ElasticPress\Elasticsearch::factory()->refresh_indices();
+		$args = array(
+			's'          => 'findme',
+			'meta_query' => array(
+				0 => array(),
+			),
+		);
+
+		$query = new \WP_Query( $args );
+
+		$this->assertTrue( $query->elasticsearch_success );
+		$this->assertEquals( 2, $query->post_count );
+		$this->assertEquals( 2, $query->found_posts );
+	}
+
 	/**
 	 * Test a query that searches and filters by a meta value like the query
 	 *