Changeset 35205

Timestamp:

10/15/2015 05:52:36 PM (11 years ago)

Author:

SergeyBiryukov

Message:

In WP::parse_request() and url_to_postid(), don't skip objects that have a post status with 'exclude_from_search' => false, e.g. inherit.

This fixes pretty permalinks for attachments, broken in [35195].

Fixes #21970.

Location:

trunk/src/wp-includes

Files:

• class-wp.php (modified) (1 diff)
• rewrite-functions.php (modified) (1 diff)

trunk/src/wp-includes/class-wp.php

@@ -216 +216 @@
 
                                                         $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;
                                                         }

trunk/src/wp-includes/rewrite-functions.php

@@ -404 +404 @@
 
                                 $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;
                                 }