Changeset 25312

Timestamp:

09/10/2013 03:01:10 AM (13 years ago)

Author:

wonderboymusic

Message:

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

Location:

trunk

Files:

• src/wp-includes/general-template.php (modified) (3 diffs)
• src/wp-includes/post.php (modified) (1 diff)
• src/wp-includes/query.php (modified) (2 diffs)
• src/wp-includes/template.php (modified) (1 diff)
• tests/phpunit/tests/query/conditionals.php (modified) (2 diffs)

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

@@ -580 +580 @@
         // If there's a post type archive
         if ( is_post_type_archive() ) {
-                $post_type_object = get_post_type_object( get_query_var( 'post_type' ) );
+                $post_type = get_query_var( 'post_type' );
+                if ( is_array( $post_type ) )
+                        $post_type = reset( $post_type );
+                $post_type_object = get_post_type_object( $post_type );
                 if ( ! $post_type_object->has_archive )
                         $title = post_type_archive_title( '', false );
@@ -707 +710 @@
                 return;
 
-        $post_type_obj = get_post_type_object( get_query_var( 'post_type' ) );
+        $post_type = get_query_var( 'post_type' );
+        if ( is_array( $post_type ) )
+                $post_type = reset( $post_type );
+
+        $post_type_obj = get_post_type_object( $post_type );
         $title = apply_filters('post_type_archive_title', $post_type_obj->labels->name );
 
@@ -1690 +1697 @@
                 }
         } elseif ( is_post_type_archive() ) {
-                $post_type_obj = get_post_type_object( get_query_var( 'post_type' ) );
+                $post_type = get_query_var( 'post_type' );
+                if ( is_array( $post_type ) )
+                        $post_type = reset( $post_type );
+
+                $post_type_obj = get_post_type_object( $post_type );
                 $title = sprintf( $args['posttypetitle'], get_bloginfo( 'name' ), $args['separator'], $post_type_obj->labels->name );
                 $href = get_post_type_archive_feed_link( $post_type_obj->name );

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/query.php

@@ -3077 +3077 @@
                         }
                 } elseif ( $this->is_post_type_archive ) {
-                        $this->queried_object = get_post_type_object( $this->get('post_type') );
+                        $post_type = $this->get( 'post_type' );
+                        if ( is_array( $post_type ) )
+                                $post_type = reset( $post_type );
+                        $this->queried_object = get_post_type_object( $post_type );
                 } elseif ( $this->is_posts_page ) {
                         $page_for_posts = get_option('page_for_posts');
@@ -3153 +3156 @@
                         return (bool) $this->is_post_type_archive;
 
-                $post_type_object = get_post_type_object( $this->get( 'post_type' ) );
+                $post_type = $this->get( 'post_type' );
+                if ( is_array( $post_type ) )
+                        $post_type = reset( $post_type );
+                $post_type_object = get_post_type_object( $post_type );
 
                 return in_array( $post_type_object->name, (array) $post_types );

trunk/src/wp-includes/template.php

@@ -81 +81 @@
  */
 function get_post_type_archive_template() {
-        $obj = get_post_type_object( get_query_var( 'post_type' ) );
+        $post_type = get_query_var( 'post_type' );
+        if ( is_array( $post_type ) )
+                $post_type = reset( $post_type );
+        
+        $obj = get_post_type_object( $post_type );
         if ( ! $obj->has_archive )
                 return '';

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

@@ -700 +700 @@
                 $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' ) );
@@ -708 +706 @@
                 $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' ) );