Changeset 25291

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.

Location:

trunk

Files:

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

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();

trunk/src/wp-includes/query.php

@@ -3148 +3148 @@
      */
     function is_post_type_archive( $post_types = '' ) {
-        if ( empty( $post_types ) || !$this->is_post_type_archive )
+        if ( empty( $post_types ) || ! $this->is_post_type_archive )
             return (bool) $this->is_post_type_archive;
 
-        $post_type_object = $this->get_queried_object();
+        $post_type_object = get_post_type_object( $this->get( 'post_type' ) );
 
         return in_array( $post_type_object->name, (array) $post_types );

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()     ) :

trunk/src/wp-includes/template.php

@@ -71 +71 @@
 
     return get_query_template( 'archive', $templates );
+}
+
+/**
+ * Retrieve path of post type archive template in current or parent template.
+ *
+ * @since 3.7.0
+ *
+ * @return string
+ */
+function get_post_type_archive_template() {
+    $obj = get_post_type_object( get_query_var( 'post_type' ) );
+    if ( ! $obj->has_archive )
+        return '';
+
+    return get_archive_template();
 }
 

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

@@ -649 +649 @@
         $this->assertQueryTrue( 'is_404' );
     }
+
+    function test_post_type_archive_with_tax_query() {
+        delete_option( 'rewrite_rules' );
+
+        $cpt_name = 'ptawtq';
+        register_post_type( $cpt_name, array(
+            'taxonomies' => array( 'post_tag', 'category' ),
+            'rewrite' => true,
+            'has_archive' => true,
+            'public' => true
+        ) );
+
+        $tag_id = $this->factory->tag->create( array( 'slug' => 'tag-slug' ) );
+        $post_id = $this->factory->post->create( array( 'post_type' => $cpt_name ) );
+        wp_set_object_terms( $post_id, $tag_id, 'post_tag' );
+
+        $this->go_to( '/ptawtq/' );
+        $this->assertQueryTrue( 'is_post_type_archive', 'is_archive' );
+        $this->assertEquals( get_queried_object(), get_post_type_object( $cpt_name ) );
+
+        add_action( 'pre_get_posts', array( $this, 'pre_get_posts_with_tax_query' ) );
+
+        $this->go_to( '/ptawtq/' );
+        $this->assertQueryTrue( 'is_post_type_archive', 'is_archive' );
+        $this->assertEquals( get_queried_object(), get_post_type_object( $cpt_name ) );
+
+        remove_action( 'pre_get_posts', array( $this, 'pre_get_posts_with_tax_query' ) );
+    }
+
+    function pre_get_posts_with_tax_query( &$query ) {
+        $term = get_term_by( 'slug', 'tag-slug', 'post_tag' );
+        $query->set( 'tax_query', array(
+            array( 'taxonomy' => 'post_tag', 'field' => 'term_id', 'terms' => $term->term_id )
+        ) );
+    }
 }