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

Timestamp:

09/06/2013 10:06:40 PM (11 years ago)

Author:

wonderboymusic

Message:

Ensure that the post type object is the queried object when a post type has been registered with has_archive => true. Ensure it is not stomped when decorated with tax_query. Adds unit tests.

Props nacin.
Fixes #18614.

File:

• trunk/src/wp-includes/general-template.php (modified) (5 diffs)

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

@@ -578 +578 @@
     }
 
+    // If there's a post type archive
+    if ( is_post_type_archive() ) {
+        $post_type_object = get_post_type_object( get_query_var( 'post_type' ) );
+        if ( ! $post_type_object->has_archive )
+            $title = post_type_archive_title( '', false );
+    }
+
     // If there's a category or tag
     if ( is_category() || is_tag() ) {
@@ -596 +603 @@
     }
 
-    // If there's a post type archive
-    if ( is_post_type_archive() )
+    // Post type archives with has_archive should override terms.
+    if ( is_post_type_archive() && $post_type_object->has_archive )
         $title = post_type_archive_title( '', false );
 
@@ -697 +704 @@
         return;
 
-    $post_type_obj = get_queried_object();
+    $post_type_obj = get_post_type_object( get_query_var( 'post_type' ) );
     $title = apply_filters('post_type_archive_title', $post_type_obj->labels->name );
 
@@ -1671 +1678 @@
     $args = wp_parse_args( $args, $defaults );
 
-    if ( is_single() || is_page() ) {
+    if ( is_singular() ) {
         $id = 0;
         $post = get_post( $id );
@@ -1679 +1686 @@
             $href = get_post_comments_feed_link( $post->ID );
         }
+    } elseif ( is_post_type_archive() ) {
+        $post_type_obj = get_post_type_object( get_query_var( '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 );
     } elseif ( is_category() ) {
         $term = get_queried_object();