WordPress.org

Make WordPress Core

Changeset 36105


Ignore:
Timestamp:
12/27/2015 02:15:30 AM (4 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:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/4.4

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

    r35725 r36105  
    42914291    foreach ( $page->ancestors as $parent ) {
    42924292        $parent = get_post( $parent );
    4293         if ( 'publish' === $parent->post_status ) {
     4293        if ( $parent ) {
    42944294            $uri = $parent->post_name . '/' . $uri;
    42954295        }
  • branches/4.4/tests/phpunit/tests/post.php

    r35705 r36105  
    675675        $this->assertEquals( 'parent/child', get_page_uri( $child_id ) );
    676676
    677         // now delete the parent and check
    678         wp_delete_post( $parent_id );
     677        // now delete the parent from the database and check
     678        wp_delete_post( $parent_id, true );
    679679        $this->assertEquals( 'child', get_page_uri( $child_id ) );
    680680    }
Note: See TracChangeset for help on using the changeset viewer.