Don't 404 for categories, tags, and authors that exist but have no posts. see #5324
git-svn-id: http://svn.automattic.com/wordpress/trunk@8761 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
716393be8f
commit
298db96458
|
@ -294,10 +294,16 @@ class WP {
|
||||||
// or if the request was a regular query string request rather than a
|
// or if the request was a regular query string request rather than a
|
||||||
// permalink request.
|
// permalink request.
|
||||||
if ( (0 == count($wp_query->posts)) && !is_404() && !is_search() && ( $this->did_permalink || (!empty($_SERVER['QUERY_STRING']) && (false === strpos($_SERVER['REQUEST_URI'], '?'))) ) ) {
|
if ( (0 == count($wp_query->posts)) && !is_404() && !is_search() && ( $this->did_permalink || (!empty($_SERVER['QUERY_STRING']) && (false === strpos($_SERVER['REQUEST_URI'], '?'))) ) ) {
|
||||||
|
// Don't 404 for these queries if they matched an object.
|
||||||
|
if ( ( is_tag() || is_category() || is_author() ) && $wp_query->get_queried_object() ) {
|
||||||
|
if ( !is_404() )
|
||||||
|
status_header( 200 );
|
||||||
|
return;
|
||||||
|
}
|
||||||
$wp_query->set_404();
|
$wp_query->set_404();
|
||||||
status_header( 404 );
|
status_header( 404 );
|
||||||
nocache_headers();
|
nocache_headers();
|
||||||
} elseif( is_404() != true ) {
|
} elseif ( !is_404() ) {
|
||||||
status_header( 200 );
|
status_header( 200 );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue