sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Media: Better handling of JOINs when searching filenames.

Browse Source 
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.

git-svn-id: https://develop.svn.wordpress.org/trunk@38733 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
joemcgill 2016-10-05 19:50:02 +00:00
parent 48e2bde86b
commit 2eade6230d
3 changed files with 101 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wp-admin/includes/ajax-actions.php
View File

@ -2401,7 +2401,9 @@ function wp_ajax_query_attachments() {
$query['post_status'] .= ',private'; $query['post_status'] .= ',private';
// Filter query clauses to include filenames. // Filter query clauses to include filenames.
add_filter( 'posts_clauses', '_filter_query_attachment_filenames' ); if ( isset( $query['s'] ) ) {
add_filter( 'posts_clauses', '_filter_query_attachment_filenames' );
}
/** /**
* Filters the arguments passed to WP_Query during an Ajax * Filters the arguments passed to WP_Query during an Ajax

10
src/wp-admin/includes/post.php
View File

@ -1145,7 +1145,9 @@ function wp_edit_attachments_query_vars( $q = false ) {
} }
// Filter query clauses to include filenames. // 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; return $q;
} }
@ -1164,12 +1166,14 @@ function _filter_query_attachment_filenames( $clauses ) {
global $wpdb; global $wpdb;
remove_filter( 'posts_clauses', __FUNCTION__ ); 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['groupby'] = "{$wpdb->posts}.ID";
$clauses['where'] = preg_replace( $clauses['where'] = preg_replace(
"/\({$wpdb->posts}.post_content (NOT LIKE|LIKE) (\'[^']+\')\)/", "/\({$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'] ); $clauses['where'] );
return $clauses; return $clauses;

91
tests/phpunit/tests/query/search.php
View File

@ -384,6 +384,97 @@ class Tests_Query_Search extends WP_UnitTestCase {
$this->assertNotEquals( array( $attachment ), $q->posts ); $this->assertNotEquals( array( $attachment ), $q->posts );
} }
/**
* @ticket 22744
*/
public function test_include_file_names_in_attachment_search_with_meta_query() {
$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-image4.png', true );
add_post_meta( $attachment, '_test_meta_key', 'value', true );
add_filter( 'posts_clauses', '_filter_query_attachment_filenames' );
// Pass post_type a string value.
$q = new WP_Query( array(
's' => 'image4',
'fields' => 'ids',
'post_type' => 'attachment',
'post_status' => 'inherit',
'meta_query' => array(
array(
'key' => '_test_meta_key',
'value' => 'value',
'compare' => '=',
),
),
) );
$this->assertSame( array( $attachment ), $q->posts );
}
/**
* @ticket 22744
*/
public function test_include_file_names_in_attachment_search_with_tax_query() {
$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 a tag to the post.
wp_set_post_terms( $attachment, 'test', 'post_tag' );
add_post_meta( $attachment, '_wp_attached_file', 'some-image5.png', true );
add_filter( 'posts_clauses', '_filter_query_attachment_filenames' );
// Pass post_type a string value.
$q = new WP_Query( array(
's' => 'image5',
'fields' => 'ids',
'post_type' => 'attachment',
'post_status' => 'inherit',
'tax_query' => array(
array(
'taxonomy' => 'post_tag',
'field' => 'slug',
'terms' => 'test',
),
),
) );
$this->assertSame( array( $attachment ), $q->posts );
}
/**
* @ticket 22744
*/
public function test_filter_query_attachment_filenames_unhooks_itself() {
add_filter( 'posts_clauses', '_filter_query_attachment_filenames' );
apply_filters( 'posts_clauses', array(
'where' => '',
'groupby' => '',
'join' => '',
'orderby' => '',
'distinct' => '',
'fields' => '',
'limit' => '',
) );
$result = has_filter( 'posts_clauses', '_filter_query_attachment_filenames' );
$this->assertFalse( $result );
}
public function filter_posts_search( $sql ) { public function filter_posts_search( $sql ) {
return $sql . ' /* posts_search */'; return $sql . ' /* posts_search */';
} }