Ticket #35762: 35762.3.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_excerpt $like_op %s) $andor_op ($wpdb->posts.post_content $like_op %s))", $like, $like, $like );
                         $searchand = ' AND ';
                 }
 
@@ -2278 +2278 @@
                                         $search_orderby .= 'WHEN ' . implode( ' OR ', $q['search_orderby_title'] ) . ' THEN 3 ';
                         }
 
-                        // sentence match in 'post_content'
+                        // sentence match in 'post_content' and 'post_excerpt'
                         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 ) {
-                                $search_orderby = '(CASE ' . $search_orderby . 'ELSE 5 END)';
+                                $search_orderby = '(CASE ' . $search_orderby . 'ELSE 6 END)';
                         }
                 } else {
                         // single word or sentence search

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 bar and baz',
+                ) );
+                $p3 = self::factory()->post->create( array(
+                        'post_status' => 'publish',
+                        'post_content' => '',
+                        'post_excerpt' => 'This post has only foo',
+                ) );
+
+                $q = new WP_Query( array(
+                        's' => 'foo',
+                        'fields' => 'ids',
+                ) );
+
+                $this->assertEqualSets( array( $p1, $p3 ), $q->posts );
+
+                $q = new WP_Query( array(
+                        's' => 'bar',
+                        'fields' => 'ids',
+                ) );
+
+                $this->assertEqualSets( array( $p1, $p2 ), $q->posts );
+
+                $q = new WP_Query( array(
+                        's' => 'baz',
+                        'fields' => 'ids',
+                ) );
+
+                $this->assertEqualSets( array( $p2 ), $q->posts );
+        }
+
+        /**
+         * @ticket 35762
+         */
+        public function test_search_order_title_before_excerpt_and_content() {
+                $p1 = self::factory()->post->create( array(
+                        'post_status' => 'publish',
+                        'post_title'  => 'This post has foo',
+                        'post_content' => '',
+                        'post_excerpt' => '',
+                ) );
+
+                $p2 = self::factory()->post->create( array(
+                        'post_status'  => 'publish',
+                        'post_title' => '',
+                        'post_content' => 'This post has foo',
+                        'post_excerpt' => '',
+                ) );
+
+                $p3 = self::factory()->post->create( array(
+                        'post_status'  => 'publish',
+                        'post_title' => '',
+                        'post_content' => '',
+                        'post_excerpt' => 'This post has foo',
+                ) );
+
+                $q = new WP_Query( array(
+                        's'      => 'this post has foo',
+                        'fields' => 'ids',
+                        'orderby' => false,
+                ) );
+
+                $this->assertSame( array( $p1, $p3, $p2 ), $q->posts );
+        }
+
         public function filter_posts_search( $sql ) {
                 return $sql . ' /* posts_search */';
         }