Ticket #15770: 15770.diff

class-wp.php

@@ -474 +474 @@
         function handle_404() {
                 global $wp_query;
 
-                if ( !is_admin() && ( 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() ) || ( is_paged() && ( 0 == count( $wp_query->posts ) ) ) ) { 
                         // Don't 404 for these queries if they matched an object.
                         if ( ( is_tag() || is_category() || is_tax() || is_author() || is_post_type_archive() ) && $wp_query->get_queried_object() && !is_paged() ) {
                                 if ( !is_404() )