Ticket #39004: 39004.2.patch

wp-admin/includes/ajax-actions.php

@@ -2403 +2403 @@
 
         // Filter query clauses to include filenames.
         if ( isset( $query['s'] ) ) {
-                add_filter( 'posts_clauses', '_filter_query_attachment_filenames' );
+                add_filter( 'posts_clauses', '_filter_query_attachment_meta' );
         }
 
         /**

wp-admin/includes/post.php

@@ -1148 +1148 @@
 
         // Filter query clauses to include filenames.
         if ( isset( $q['s'] ) ) {
-                add_filter( 'posts_clauses', '_filter_query_attachment_filenames' );
+                add_filter( 'posts_clauses', '_filter_query_attachment_meta' );
         }
 
         return $q;
 }
 
 /**
- * Filter the SQL clauses of an attachment query to include filenames.
+ * Filter the SQL clauses of an attachment query to include meta (filename/alt).
  *
  * @since 4.7.0
  * @access private
@@ -1166 +1166 @@
  *                       DISTINCT, fields (SELECT), and LIMITS clauses.
  * @return array The modified clauses.
  */
-function _filter_query_attachment_filenames( $clauses ) {
+function _filter_query_attachment_meta( $clauses ) {
         global $wpdb;
         remove_filter( 'posts_clauses', __FUNCTION__ );
 
         // Add a LEFT JOIN of the postmeta table so we don't trample existing JOINs.
-        $clauses['join'] .= " LEFT JOIN {$wpdb->postmeta} AS sq1 ON ( {$wpdb->posts}.ID = sq1.post_id AND sq1.meta_key = '_wp_attached_file' )";
+        $clauses['join'] .= " LEFT JOIN {$wpdb->postmeta} AS sq1 ON ( {$wpdb->posts}.ID = sq1.post_id AND ( sq1.meta_key = '_wp_attached_file' OR sq1.meta_key = '_wp_attachment_image_alt'  ) )";
 
         $clauses['groupby'] = "{$wpdb->posts}.ID";