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

Kill the query in the following edge case: `post_type => 'any'` but `exclude_from_search => false` returns no valid post types. Adds unit tests. 

Props mitchoyoshitaka.
Fixes #19198.



git-svn-id: https://develop.svn.wordpress.org/trunk@25239 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Scott Taylor 2013-09-04 18:50:04 +00:00
parent 0d0b17b617
commit 24bf60bb4f
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wp-includes/query.php
View File

@ -2455,7 +2455,9 @@ class WP_Query {
if ( 'any' == $post_type ) { if ( 'any' == $post_type ) {
$in_search_post_types = get_post_types( array('exclude_from_search' => false) ); $in_search_post_types = get_post_types( array('exclude_from_search' => false) );
if ( ! empty( $in_search_post_types ) ) if ( empty( $in_search_post_types ) )
$where .= ' AND 1=0 ';
else
$where .= " AND $wpdb->posts.post_type IN ('" . join("', '", $in_search_post_types ) . "')"; $where .= " AND $wpdb->posts.post_type IN ('" . join("', '", $in_search_post_types ) . "')";
} elseif ( !empty( $post_type ) && is_array( $post_type ) ) { } elseif ( !empty( $post_type ) && is_array( $post_type ) ) {
$where .= " AND $wpdb->posts.post_type IN ('" . join("', '", $post_type) . "')"; $where .= " AND $wpdb->posts.post_type IN ('" . join("', '", $post_type) . "')";

19
tests/phpunit/tests/query/results.php
View File

@ -369,4 +369,23 @@ class Tests_Query_Results extends WP_UnitTestCase {
'child-two', 'child-two',
), wp_list_pluck( $posts, 'post_title' ) ); ), wp_list_pluck( $posts, 'post_title' ) );
} }
function test_exlude_from_search_empty() {
global $wp_post_types;
foreach ( array_keys( $wp_post_types ) as $slug )
$wp_post_types[$slug]->exclude_from_search = true;
$posts = $this->q->query( array( 'post_type' => 'any' ) );
$this->assertEmpty( $posts );
$this->assertRegExp( '#AND 1=0#', $this->q->request );
foreach ( array_keys( $wp_post_types ) as $slug )
$wp_post_types[$slug]->exclude_from_search = false;
$posts2 = $this->q->query( array( 'post_type' => 'any' ) );
$this->assertNotEmpty( $posts2 );
$this->assertNotRegExp( '#AND 1=0#', $this->q->request );
}
} }