Move checks for post_type being an array inline. See [25291], [25292], #18614.

git-svn-id: https://develop.svn.wordpress.org/trunk@25312 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Scott Taylor
2013-09-10 03:01:10 +00:00
parent 9ece28e545
commit e72ffa5d96
5 changed files with 27 additions and 13 deletions

View File

@@ -699,16 +699,12 @@ class Tests_Query_Conditionals extends WP_UnitTestCase {
$this->go_to( "/$cpt_name/" );
$this->assertQueryTrue( 'is_post_type_archive', 'is_archive' );
$this->assertEquals( get_queried_object(), get_post_type_object( $cpt_name ) );
$this->assertEquals( get_queried_object(), get_post_type_object( array( $cpt_name ) ) );
$this->assertEquals( get_queried_object(), get_post_type_object( array( $cpt_name, 'post' ) ) );
add_action( 'pre_get_posts', array( $this, 'pre_get_posts_with_type_array' ) );
$this->go_to( "/$cpt_name/" );
$this->assertQueryTrue( 'is_post_type_archive', 'is_archive' );
$this->assertEquals( get_queried_object(), get_post_type_object( 'post' ) );
$this->assertEquals( get_queried_object(), get_post_type_object( array( 'post' ) ) );
$this->assertEquals( get_queried_object(), get_post_type_object( array( 'post', $cpt_name ) ) );
remove_action( 'pre_get_posts', array( $this, 'pre_get_posts_with_type_array' ) );
}