Changeset 25292

Timestamp:

09/06/2013 11:38:51 PM (13 years ago)

Author:

wonderboymusic

Message:

Check the value passed to get_post_type_object(). If it's an array, use the first item. get_query_var( 'post_type' ) can be an array if the query has been altered via filters/actions. There are several places in core that pass the query var. Adds unit tests.

In template-loader.php, move is_post_type_archive() and is_tax() directly below is_home().

See #18614, [25291].

Location:

trunk

Files:

• src/wp-includes/post.php (modified) (1 diff)
• src/wp-includes/template-loader.php (modified) (1 diff)
• tests/phpunit/tests/query/conditionals.php (modified) (1 diff)

trunk/src/wp-includes/post.php

@@ -1058 +1058 @@
 function get_post_type_object( $post_type ) {
         global $wp_post_types;
+
+        if ( is_array( $post_type ) )
+                $post_type = reset( $post_type );
 
         if ( empty($wp_post_types[$post_type]) )

trunk/src/wp-includes/template-loader.php

@@ -27 +27 @@
         if     ( is_404()            && $template = get_404_template()            ) :
         elseif ( is_search()         && $template = get_search_template()         ) :
-        elseif ( is_post_type_archive() && $template = get_post_type_archive_template() ) : 
-        elseif ( is_tax()            && $template = get_taxonomy_template()       ) :
         elseif ( is_front_page()     && $template = get_front_page_template()     ) :
         elseif ( is_home()           && $template = get_home_template()           ) :
+        elseif ( is_post_type_archive() && $template = get_post_type_archive_template() ) :
+        elseif ( is_tax()            && $template = get_taxonomy_template()       ) :
         elseif ( is_attachment()     && $template = get_attachment_template()     ) :
                 remove_filter('the_content', 'prepend_attachment');

trunk/tests/phpunit/tests/query/conditionals.php

@@ -684 +684 @@
                 ) );
         }
+
+        function test_post_type_array() {
+                delete_option( 'rewrite_rules' );
+
+                $cpt_name = 'thearray';
+                register_post_type( $cpt_name, array(
+                        'taxonomies' => array( 'post_tag', 'category' ),
+                        'rewrite' => true,
+                        'has_archive' => true,
+                        'public' => true
+                ) );
+                $this->factory->post->create( array( 'post_type' => $cpt_name ) );
+
+                $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' ) );
+        }
+
+        function pre_get_posts_with_type_array( &$query ) {
+                $query->set( 'post_type', array( 'post', 'thearray' ) );
+        }
 }