Restore [13194] which was accidentally overwritten in [13315]. See #12256

git-svn-id: http://svn.automattic.com/wordpress/trunk@13323 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
dd32 2010-02-23 07:10:47 +00:00
parent 955e9e7527
commit 3f35e43429

View File

@ -474,7 +474,7 @@ class WP {
function handle_404() {
global $wp_query;
if ( ( 0 == count( $wp_query->posts ) ) && !is_404() && !is_search() && !is_home() ) {
if ( ( 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() ) {
if ( !is_404() )