Wordpress 3.0.4-scripts

[autoinstalls/wordpress.git] / wp-includes / classes.php

diff --git a/wp-includes/classes.php b/wp-includes/classes.php
index 9a136a38c438a3159a77e1f5c9dd55d7c2c76f82..f24a6ec28905df960f82af0dcb3f72f5d46559e5 100644 (file)
--- a/wp-includes/classes.php
+++ b/wp-includes/classes.php
@@ -474,7 +474,7 @@ class WP {
        function handle_404() {
                global $wp_query;
 
-               if ( ( 0 == count( $wp_query->posts ) ) && !is_404() && !is_robots() && !is_search() && !is_home() ) {
+               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_404() )