Ticket #17316: 17316.diff

wp-includes/class-wp.php

@@ -470 +470 @@
 
                 if ( !is_admin() && ( 0 == count( $wp_query->posts ) ) && !is_404() && !is_robots() && !is_search() && !is_home() ) {
                         // Don't 404 for these queries if they matched an object.
-                        if ( ( is_tag() || is_category() || is_tax() || is_author() ) && $wp_query->get_queried_object() && !is_paged() ) {
+                        if ( ( is_tag() || is_category() || is_tax() || is_author() || is_post_type_archive() ) && $wp_query->get_queried_object() && !is_paged() ) {
                                 if ( !is_404() )
                                         status_header( 200 );
                                 return;