Changeset 35195 for trunk/src/wp-includes/rewrite-functions.php

Timestamp:

10/15/2015 06:48:22 AM (9 years ago)

Author:

SergeyBiryukov

Message:

In WP::parse_request() and url_to_postid(), if a post slug clashes with a trashed page, return the post instead of the page.

Props kovshenin, SergeyBiryukov, igmoweb.
Fixes #21970.

File:

• trunk/src/wp-includes/rewrite-functions.php (modified) (1 diff)

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

@@ -398 +398 @@
             if ( $wp_rewrite->use_verbose_page_rules && preg_match( '/pagename=\$matches\[([0-9]+)\]/', $query, $varmatch ) ) {
                 // This is a verbose page match, let's check to be sure about it.
-                if ( ! get_page_by_path( $matches[ $varmatch[1] ] ) )
+                $page = get_page_by_path( $matches[ $varmatch[1] ] );
+                if ( ! $page ) {
                     continue;
+                }
+
+                $post_status_obj = get_post_status_object( $page->post_status );
+                if ( ! $post_status_obj->public && ! $post_status_obj->protected && ! $post_status_obj->private ) {
+                    continue;
+                }
             }