Ticket #21970: 21970.4.diff

src/wp-includes/class-wp.php

@@ -215 +215 @@
                                                         }
 
                                                         $post_status_obj = get_post_status_object( $page->post_status );
-                                                        if ( ! $post_status_obj->public && ! $post_status_obj->protected && ! $post_status_obj->private ) {
+                                                        if ( ! $post_status_obj->public && ! $post_status_obj->protected
+                                                                && ! $post_status_obj->private && $post_status_obj->exclude_from_search ) {
                                                                 continue;
                                                         }
                                                 }

src/wp-includes/rewrite-functions.php

@@ -403 +403 @@
                                 }
 
                                 $post_status_obj = get_post_status_object( $page->post_status );
-                                if ( ! $post_status_obj->public && ! $post_status_obj->protected && ! $post_status_obj->private ) {
+                                if ( ! $post_status_obj->public && ! $post_status_obj->protected
+                                        && ! $post_status_obj->private && $post_status_obj->exclude_from_search ) {
                                         continue;
                                 }
                         }