Ticket #22744: 22744.8.diff

src/wp-includes/class-wp-query.php

@@ -1341 +1341 @@
                         }
 
                         $like = $n . $this->db->esc_like( $term ) . $n;
-                        $search .= $this->db->prepare( "{$searchand}(({$this->db->posts}.post_title $like_op %s) $andor_op ({$this->db->posts}.post_excerpt $like_op %s) $andor_op ({$this->db->posts}.post_content $like_op %s))", $like, $like, $like );
+
+                        // If this is a search for attachments, inlcude the filename in the search.
+                        if ( array( 'attachment' ) === (array) $q['post_type'] ) {
+                                $search .= $this->db->prepare( "{$searchand}(({$this->db->posts}.post_title $like_op %s) $andor_op ({$this->db->posts}.post_excerpt $like_op %s) $andor_op ({$this->db->posts}.post_content $like_op %s) $andor_op ({$this->db->postmeta}.meta_key = '_wp_attached_file' AND {$this->db->postmeta}.meta_value $like_op %s))", $like, $like, $like, $like );
+                        } else {
+                                $search .= $this->db->prepare( "{$searchand}(({$this->db->posts}.post_title $like_op %s) $andor_op ({$this->db->posts}.post_excerpt $like_op %s) $andor_op ({$this->db->posts}.post_content $like_op %s))", $like, $like, $like );
+                        }
+
                         $searchand = ' AND ';
                 }
 
@@ -2068 +2075 @@
                         }
                 }
 
-                if ( !empty( $this->tax_query->queries ) || !empty( $this->meta_query->queries ) ) {
+                if ( ! empty( $this->tax_query->queries ) || ! empty( $this->meta_query->queries ) || ( $this->is_search && array( 'attachment' ) === (array) $q['post_type'] ) ) {
                         $groupby = "{$this->db->posts}.ID";
                 }
 
@@ -2117 +2124 @@
                 }
                 $where .= $search . $whichauthor . $whichmimetype;
 
+                // Modify the JOIN clause for attachment searches.
+                if ( $this->is_search && array( 'attachment' ) === (array) $q['post_type'] ) {
+                        $join .= " INNER JOIN {$this->db->postmeta} ON ( {$this->db->posts}.ID = {$this->db->postmeta}.post_id )";
+                }
+
                 if ( ! empty( $this->meta_query->queries ) ) {
                         $clauses = $this->meta_query->get_sql( 'post', $this->db->posts, 'ID', $this );
                         $join   .= $clauses['join'];

tests/phpunit/tests/query/search.php

@@ -280 +280 @@
                 $this->assertSame( array( $p1, $p3, $p2 ), $q->posts );
         }
 
+        /**
+         * @ticket 22744
+         */
+        public function test_s_should_include_file_names_in_attachment_search_as_string() {
+                $attachment = self::factory()->post->create( array(
+                        'post_type'    => 'attachment',
+                        'post_status'  => 'publish',
+                        'post_title'   => 'bar foo',
+                        'post_content' => 'foo bar',
+                        'post_excerpt' => 'This post has foo',
+                ) );
+
+                add_post_meta( $attachment, '_wp_attached_file', 'some-image1.png', true );
+
+                // Pass post_type a string value.
+                $q = new WP_Query( array(
+                        's'           => 'image1',
+                        'fields'      => 'ids',
+                        'post_type'   => 'attachment',
+                        'post_status' => 'inherit',
+                ) );
+
+                $this->assertSame( array( $attachment ), $q->posts );
+        }
+
+        /**
+         * @ticket 22744
+         */
+        public function test_s_should_include_file_names_in_attachment_search_as_array() {
+                $attachment = self::factory()->post->create( array(
+                        'post_type'    => 'attachment',
+                        'post_status'  => 'publish',
+                        'post_title'   => 'bar foo',
+                        'post_content' => 'foo bar',
+                        'post_excerpt' => 'This post has foo',
+                ) );
+
+                add_post_meta( $attachment, '_wp_attached_file', 'some-image2.png', true );
+
+                // Pass post_type an array value.
+                $q = new WP_Query( array(
+                        's'           => 'image2',
+                        'fields'      => 'ids',
+                        'post_type'   => array( 'attachment' ),
+                        'post_status' => 'inherit',
+                ) );
+
+                $this->assertSame( array( $attachment ), $q->posts );
+        }
+
+        /**
+         * @ticket 22744
+         */
+        public function test_s_should_exclude_attachment_file_names_in_general_searches() {
+                $attachment = self::factory()->post->create( array(
+                        'post_type'    => 'attachment',
+                        'post_status'  => 'publish',
+                        'post_title'   => 'bar foo',
+                        'post_content' => 'foo bar',
+                        'post_excerpt' => 'This post has foo',
+                ) );
+
+                add_post_meta( $attachment, '_wp_attached_file', 'some-image3.png', true );
+
+                $q = new WP_Query( array(
+                        's'           => 'image3',
+                        'fields'      => 'ids',
+                        'post_type'   => array( 'post', 'page', 'attachment' ),
+                        'post_status' => 'inherit',
+                ) );
+
+                $this->assertNotEquals( array( $attachment ), $q->posts );
+        }
+
         public function filter_posts_search( $sql ) {
                 return $sql . ' /* posts_search */';
         }