Changeset 38733 for trunk/src/wp-admin/includes/post.php

Timestamp:

10/05/2016 07:50:02 PM (7 years ago)

Author:

joemcgill

Message:

Media: Better handling of JOINs when searching filenames.

Following [38625], any media searches that already included JOINs,
e.g., tax_queries, would get trampled when we joined the post meta
table to search for filenames. This preserves existing JOINs and
also only applies the _filter_query_attachment_filenames() filter
when a search query is being performed.

Props flixos90, joemcgill.
Fixes #22744.

File:

• trunk/src/wp-admin/includes/post.php (modified) (2 diffs)

trunk/src/wp-admin/includes/post.php

@@ -1146 +1146 @@
 
     // Filter query clauses to include filenames.
-    add_filter( 'posts_clauses', '_filter_query_attachment_filenames' );
+    if ( isset( $q['s'] ) ) {
+        add_filter( 'posts_clauses', '_filter_query_attachment_filenames' );
+    }
 
     return $q;
@@ -1165 +1167 @@
     remove_filter( 'posts_clauses', __FUNCTION__ );
 
-    $clauses['join'] = " INNER JOIN {$wpdb->postmeta} ON ( {$wpdb->posts}.ID = {$wpdb->postmeta}.post_id )";
+    // 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['groupby'] = "{$wpdb->posts}.ID";
 
     $clauses['where'] = preg_replace(
         "/\({$wpdb->posts}.post_content (NOT LIKE|LIKE) (\'[^']+\')\)/",
-        "$0 OR ( {$wpdb->postmeta}.meta_key = '_wp_attached_file' AND {$wpdb->postmeta}.meta_value $1 $2 )",
+        "$0 OR ( sq1.meta_value $1 $2 )",
         $clauses['where'] );