Ticket #14477: 14477.4.diff

src/wp-includes/post.php

@@ -4290 +4290 @@
 function get_page_children($page_id, $pages) {
         $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) )
                                 $page_list = array_merge($page_list, $children);
@@ -4624 +4624 @@
         // Update cache.
         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);
         }
@@ -4652 +4655 @@
 
         wp_cache_set( $cache_key, $page_structure, 'posts' );
 
-        // Convert to WP_Post instances.
-        $pages = array_map( 'get_post', $pages );
-
         /**
          * Filter the retrieved list of pages.
          *

tests/phpunit/tests/post/getPages.php

@@ -268 +268 @@
                 $exclude6 = get_pages( array( 'exclude_tree' => array( $post_id1, $post_id3 ) ) );
                 $this->assertCount( 2, $exclude6 );
         }
+
+        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' ) );
+        }
 }
+ No newline at end of file