Ticket #32824: 32824.post-slug-and-term-description-search.patch

diff --git a/src/wp-includes/class-wp-query.php b/src/wp-includes/class-wp-query.php
index 3b6c9d8e1a..abcd123456 100644
--- a/src/wp-includes/class-wp-query.php
+++ b/src/wp-includes/class-wp-query.php
@@ -1452,7 +1452,13 @@ class WP_Query {
 
                                $searchand                          = '';
                                $query_vars['search_orderby_title'] = array();
-                               $default_search_columns = array( 'post_title', 'post_excerpt', 'post_content' );
+
+                               /*
+                                * Include post slug (post_name) in default search columns
+                                * to ensure consistency with term searches.
+                                *
+                                * @see https://core.trac.wordpress.org/ticket/32824
+                                */
+                               $default_search_columns = array( 'post_title', 'post_excerpt', 'post_content', 'post_name' );
 
                                $search_columns = ! empty( $query_vars['search_columns'] ) ? $query_vars['search_columns'] : $default_search_columns;
 
diff --git a/src/wp-includes/class-wp-term-query.php b/src/wp-includes/class-wp-term-query.php
index 9d4a2c1f33..efgh789012 100644
--- a/src/wp-includes/class-wp-term-query.php
+++ b/src/wp-includes/class-wp-term-query.php
@@ -1107,7 +1107,14 @@ class WP_Term_Query {
 
                        $like = '%' . $wpdb->esc_like( $search ) . '%';
 
-                       return $wpdb->prepare( '((t.name LIKE %s) OR (t.slug LIKE %s))', $like, $like );
+                       /*
+                        * Include term description in search results to align
+                        * with post search behavior.
+                        *
+                        * @see https://core.trac.wordpress.org/ticket/32824
+                        */
+                       return $wpdb->prepare(
+                               '((t.name LIKE %s) OR (t.slug LIKE %s) OR (tt.description LIKE %s))',
+                               $like,
+                               $like,
+                               $like
+                       );
                }
 
diff --git a/tests/phpunit/tests/query/search.php b/tests/phpunit/tests/query/search.php
index 1a2b3c4d5e..9876543210 100644
--- a/tests/phpunit/tests/query/search.php
+++ b/tests/phpunit/tests/query/search.php
@@ -647,6 +647,35 @@ class Tests_Query_Search extends WP_UnitTestCase {
                }
 
                /**
+                * Ticket #32824
+                *
+                * Ensure search matches post slug (post_name)
+                * when the keyword is not present in title or content.
+                */
+               public function test_search_matches_post_slug() {
+                       $post_id = self::factory()->post->create(
+                               array(
+                                       'post_title'   => 'Unrelated title',
+                                       'post_content' => 'No matching keyword here',
+                                       'post_name'    => 'my-special-search-slug',
+                               )
+                       );
+
+                       $query = new WP_Query(
+                               array(
+                                       's'              => 'special-search',
+                                       'posts_per_page' => -1,
+                               )
+                       );
+
+                       $this->assertContains(
+                               $post_id,
+                               wp_list_pluck( $query->posts, 'ID' ),
+                               'Post search should return results when matching the post slug.'
+                       );
+               }
+
+               /**
                 * Tests search ordering by post title.
                 */
                public function test_search_orderby_title() {
diff --git a/tests/phpunit/tests/term/query.php b/tests/phpunit/tests/term/query.php
index aabbccdde1..1122334455 100644
--- a/tests/phpunit/tests/term/query.php
+++ b/tests/phpunit/tests/term/query.php
@@ -1210,6 +1210,34 @@ class Tests_Term_Query extends WP_UnitTestCase {
                }
 
                /**
+                * Ticket #32824
+                *
+                * Ensure term search matches taxonomy description.
+                */
+               public function test_search_matches_term_description() {
+                       $term = wp_insert_term(
+                               'Some Category',
+                               'category',
+                               array(
+                                       'slug'        => 'some-category',
+                                       'description' => 'Unique description keyword',
+                               )
+                       );
+
+                       $query = new WP_Term_Query(
+                               array(
+                                       'taxonomy'   => 'category',
+                                       'search'     => 'unique',
+                                       'hide_empty' => false,
+                               )
+                       );
+
+                       $terms = $query->get_terms();
+
+                       $this->assertContains(
+                               $term['term_id'],
+                               wp_list_pluck( $terms, 'term_id' )
+                       );
+               }
+
        }