Changeset 36105

Timestamp:

12/27/2015 02:15:30 AM (9 years ago)

Author:

dd32

Message:

Pages: get_page_uri() should return the URI at which the resource being accessed is available at, this may include non-'publish' status posts.

Reverts [34001] and fixes the original issue in #15963 - avoiding a PHP Notice for when the post doesn't exist.

Merges [36094] to the 4.4 branch.
Props tharsheblows.
See #15963.
Fixes #35084.

Location:

branches/4.4

Files:

• . (modified) (1 prop)
• src/wp-includes/post.php (modified) (1 diff)
• tests/phpunit/tests/post.php (modified) (1 diff)

branches/4.4/src/wp-includes/post.php

@@ -4291 +4291 @@
     foreach ( $page->ancestors as $parent ) {
         $parent = get_post( $parent );
-        if ( 'publish' === $parent->post_status ) {
+        if ( $parent ) {
             $uri = $parent->post_name . '/' . $uri;
         }

branches/4.4/tests/phpunit/tests/post.php

@@ -675 +675 @@
         $this->assertEquals( 'parent/child', get_page_uri( $child_id ) );
 
-        // now delete the parent and check
-        wp_delete_post( $parent_id );
+        // now delete the parent from the database and check
+        wp_delete_post( $parent_id, true );
         $this->assertEquals( 'child', get_page_uri( $child_id ) );
     }