Changeset 54534 for branches/6.0/src/wp-includes/class-wp-query.php

Timestamp:

10/17/2022 12:24:45 PM (3 years ago)

Author:

audrasjb

Message:

Media: Refactor search by filename within the admin.

Props vortfu, xknown, peterwilsoncc, paulkevan.
Merges [54524] to the 6.0 branch.

Location:

branches/6.0

Files:

• . (modified) (1 prop)
• src/wp-includes/class-wp-query.php (modified) (5 diffs)

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

@@ -444 +444 @@
      */
     public $thumbnails_cached = false;
+
+    /**
+     * Controls whether an attachment query should include filenames or not.
+     *
+     * @since 6.0.3
+     * @var bool
+     */
+    protected $allow_query_attachment_by_filename = false;
 
     /**
@@ -1415 +1423 @@
             }
 
-            $like      = $n . $wpdb->esc_like( $term ) . $n;
-            $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 );
+            $like = $n . $wpdb->esc_like( $term ) . $n;
+
+            if ( ! empty( $this->allow_query_attachment_by_filename ) ) {
+                $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) $andor_op (sq1.meta_value $like_op %s))", $like, $like, $like, $like );
+            } else {
+                $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 ';
         }
@@ -1811 +1824 @@
         $q = $this->fill_query_vars( $q );
 
+        /**
+         * Filters whether an attachment query should include filenames or not.
+         *
+         * @since 6.0.3
+         *
+         * @param bool $allow_query_attachment_by_filename Whether or not to include filenames.
+         */
+        $this->allow_query_attachment_by_filename = apply_filters( 'wp_allow_query_attachment_by_filename', false );
+        remove_all_filters( 'wp_allow_query_attachment_by_filename' );
+
         // Parse meta query.
         $this->meta_query = new WP_Meta_Query();
@@ -2242 +2265 @@
         }
 
-        if ( ! empty( $this->tax_query->queries ) || ! empty( $this->meta_query->queries ) ) {
+        if ( ! empty( $this->tax_query->queries ) || ! empty( $this->meta_query->queries ) || ! empty( $this->allow_query_attachment_by_filename ) ) {
             $groupby = "{$wpdb->posts}.ID";
         }
@@ -2318 +2341 @@
         }
         $where .= $search . $whichauthor . $whichmimetype;
+
+        if ( ! empty( $this->allow_query_attachment_by_filename ) ) {
+            $join .= " LEFT JOIN {$wpdb->postmeta} AS sq1 ON ( {$wpdb->posts}.ID = sq1.post_id AND sq1.meta_key = '_wp_attached_file' )";
+        }
 
         if ( ! empty( $this->meta_query->queries ) ) {