Changeset 30159

Timestamp:

11/01/2014 08:43:55 PM (10 years ago)

Author:

wonderboymusic

Message:

Allow get_pages(), with child_of passed to it, to work with interrupted hierarchies.

Adds unit test.
Fixes #18962.

Location:

trunk

Files:

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

trunk/src/wp-includes/post.php

@@ -4286 +4286 @@
     $page_list = array();
     foreach ( (array) $pages as $page ) {
-        if ( $page->post_parent == $page_id ) {
+        if ( $page->post_parent == $page_id || in_array( $page_id, $page->ancestors ) ) {
             $page_list[] = $page;
             if ( $children = get_page_children($page->ID, $pages) )
@@ -4620 +4620 @@
     update_post_cache( $pages );
 
+    // Convert to WP_Post instances
+    $pages = array_map( 'get_post', $pages );
+
     if ( $child_of || $hierarchical ) {
         $pages = get_page_children($child_of, $pages);
@@ -4647 +4650 @@
 
     wp_cache_set( $cache_key, $page_structure, 'posts' );
-
-    // Convert to WP_Post instances.
-    $pages = array_map( 'get_post', $pages );
 
     /**

trunk/tests/phpunit/tests/post/getPages.php

@@ -269 +269 @@
         $this->assertCount( 2, $exclude6 );
     }
+
+    /**
+     * @ticket 14477
+     */
+    function test_get_pages_interrupted_hierarchy() {
+        $page1 = $this->factory->post->create( array( 'post_type' => 'page' ) );
+        $page2 = $this->factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page1 ) );
+        add_post_meta( $page2, 'color', 'red' );
+        $page3 = $this->factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page2 ) );
+        add_post_meta( $page3, 'color', 'blue' );
+
+        $pages = get_pages( array( 'child_of' => $page1, 'meta_key' => 'color', 'meta_value' => 'blue' ) );
+        $this->assertEqualSets( array( $page3 ), wp_list_pluck( $pages, 'ID' ) );
+    }
 }