Changeset 25312 for trunk/src/wp-includes/general-template.php

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.

File:

• trunk/src/wp-includes/general-template.php (modified) (3 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 );