Ticket #18614: 18614.5.diff

tests/phpunit/tests/query/conditionals.php

@@ -648 +648 @@
                 $this->go_to( '/2013/11/41/' );
                 $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 )
+                ) );
+        }
 }

src/wp-includes/template-loader.php

@@ -26 +26 @@
         $template = false;
         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()           ) :

src/wp-includes/template.php

@@ -73 +73 @@
 }
 
 /**
+ * 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();
+}
+
+/**
  * Retrieve path of author template in current or parent template.
  *
  * @since 1.5.0

src/wp-includes/query.php

@@ -3147 +3147 @@
          * @return bool
          */
         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 );
         }

src/wp-includes/general-template.php

@@ -577 +577 @@
                 $title = single_post_title( '', false );
         }
 
+        // 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() ) {
                 $title = single_term_title( '', false );
@@ -595 +602 @@
                 $title = $author->display_name;
         }
 
-        // 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 );
 
         // If there's a month
@@ -696 +703 @@
         if ( ! is_post_type_archive() )
                 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 );
 
         if ( $display )
@@ -1670 +1677 @@
 
         $args = wp_parse_args( $args, $defaults );
 
-        if ( is_single() || is_page() ) {
+        if ( is_singular() ) {
                 $id = 0;
                 $post = get_post( $id );
 
@@ -1678 +1685 @@
                         $title = sprintf( $args['singletitle'], get_bloginfo('name'), $args['separator'], esc_html( get_the_title() ) );
                         $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();