Changeset 36253

Timestamp:

01/10/2016 06:27:06 PM (10 years ago)

Author:

swissspidy

Message:

Permalinks: Ensure the page hierarchy is correct for sample permalinks.

Fixes #35368.

Location:

trunk

Files:

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

trunk/src/wp-includes/post.php

@@ -4292 +4292 @@
  */
 function get_page_uri( $page ) {
-    $page = get_post( $page );
+    if ( ! $page instanceof WP_Post ) {
+        $page = get_post( $page );
+    }
 
     if ( ! $page )

trunk/tests/phpunit/tests/admin/includesPost.php

@@ -455 +455 @@
     }
 
+    /**
+     * @ticket 35368
+     */
+    public function test_get_sample_permalink_should_respect_hierarchy_of_draft_pages() {
+        $this->set_permalink_structure( '/%postname%/' );
+
+        $parent = self::factory()->post->create( array(
+            'post_type'  => 'page',
+            'post_title' => 'Parent Page',
+        ) );
+
+        $child = self::factory()->post->create( array(
+            'post_type'   => 'page',
+            'post_title'  => 'Child Page',
+            'post_parent' => $parent,
+            'post_status' => 'draft',
+        ) );
+
+        $actual = get_sample_permalink( $child );
+        $this->assertSame( home_url() . '/parent-page/%pagename%/', $actual[0] );
+        $this->assertSame( 'child-page', $actual[1] );
+    }
+
     public function test_post_exists_should_match_title() {
         $p = self::factory()->post->create( array(