Wordpress 3.2

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

diff --git a/wp-includes/class-wp.php b/wp-includes/class-wp.php
index 7ca64697a5a4754b2dbfb093d6e042c8a02351a3..cf671bd79dc9025723b9250a02e84383ed9a3260 100644 (file)
--- a/wp-includes/class-wp.php
+++ b/wp-includes/class-wp.php
@@ -470,7 +470,7 @@ class WP {
 
                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;
@@ -504,18 +504,6 @@ class WP {
                do_action_ref_array('wp', array(&$this));
        }
 
-       /**
-        * PHP4 Constructor - Does nothing.
-        *
-        * Call main() method when ready to run setup.
-        *
-        * @since 2.0.0
-        *
-        * @return WP
-        */
-       function WP() {
-               // Empty.
-       }
 }
 
 /**