Ticket #35762: 35762.2.diff

src/wp-includes/query.php

@@ -2154 +2154 @@
                         }
 
                         $like = $n . $wpdb->esc_like( $term ) . $n;
-                        $search .= $wpdb->prepare( "{$searchand}(($wpdb->posts.post_title $like_op %s) $andor_op ($wpdb->posts.post_content $like_op %s))", $like, $like );
+                        $search .= $wpdb->prepare( "{$searchand}(($wpdb->posts.post_title $like_op %s) $andor_op ($wpdb->posts.post_content $like_op %s) $andor_op ($wpdb->posts.post_excerpt $like_op %s))", $like, $like, $like );
                         $searchand = ' AND ';
                 }
 
@@ -2280 +2280 @@
 
                         // sentence match in 'post_content'
                         if ( $like ) {
-                                $search_orderby .= $wpdb->prepare( "WHEN $wpdb->posts.post_content LIKE %s THEN 4 ", $like );
+                                $search_orderby .= $wpdb->prepare( "WHEN $wpdb->posts.post_excerpt LIKE %s THEN 4 ", $like );
+                                $search_orderby .= $wpdb->prepare( "WHEN $wpdb->posts.post_content LIKE %s THEN 5 ", $like );
                         }
 
                         if ( $search_orderby ) {

tests/phpunit/tests/query/search.php

@@ -178 +178 @@
                 $this->assertNotContains( 'posts_search', $q->request );
         }
 
+        /**
+         * @ticket 35762
+         */
+        public function test_search_post_excerpt() {
+                $p1 = self::factory()->post->create( array(
+                        'post_status' => 'publish',
+                        'post_content' => 'This post has foo but also bar',
+                ) );
+                $p2 = self::factory()->post->create( array(
+                        'post_status' => 'publish',
+                        'post_content' => '',
+                        'post_excerpt' => 'This post has only bar',
+                ) );
+                $p3 = self::factory()->post->create( array(
+                        'post_status' => 'publish',
+                        'post_content' => '',
+                        'post_excerpt' => 'This post has only foo-bar',
+                ) );
+
+                $q = new WP_Query( array(
+                        's' => 'foo-bar',
+                        'fields' => 'ids',
+                ) );
+
+                $this->assertEqualSets( array( $p3 ), $q->posts );
+
+                $q = new WP_Query( array(
+                        's' => 'bar',
+                        'fields' => 'ids',
+                ) );
+
+                $this->assertEqualSets( array( $p1, $p2, $p3 ), $q->posts );
+
+                $q = new WP_Query( array(
+                        's' => 'foo bar',
+                        'fields' => 'ids',
+                ) );
+
+                $this->assertEqualSets( array( $p1, $p3 ), $q->posts );
+        }
+
         public function filter_posts_search( $sql ) {
                 return $sql . ' /* posts_search */';
         }