Ticket #14477: 14477.7.diff

src/wp-includes/post.php

@@ -4457 +4457 @@
 }
 
 /**
+ * Retrieve all descendants of a given page ID, in a flat list.
+ * Respects heirarchy, then alphabetical.
+ * Needs a better name.
+ *
+ * @since 4.9
+ *
+ * @param int   $page_id Page ID.
+ * @return array List of page children.
+ */
+
+function get_page_descendants( $page_id ) {
+        $descendants = array();
+
+        $to_look = get_posts( array (
+                'post_parent' => ($page_id !== false ? $page_id : -1),
+                'post_type' => 'page',
+                'posts_per_page' => -1
+        ) );
+
+        $descendants = $to_look;
+
+        foreach($to_look as $index => $descendant) {
+                $next_descendants = get_page_descendants( $descendant->ID );
+                array_splice($descendants, $index, 0, $next_descendants);
+        }
+
+        $descendants = array_unique($descendants, SORT_REGULAR);
+
+        return $descendants;
+}
+/**
  * Order the pages with children under parents in a flat list.
  *
  * It uses auxiliary structure to hold parent-children relationships and
@@ -4804 +4835 @@
         update_post_cache( $pages );
 
         if ( $child_of || $hierarchical ) {
-                $pages = get_page_children($child_of, $pages);
+                $descendants = get_page_descendants($child_of);
+                foreach($pages as $index => $page) {
+                        if( !in_array($page->ID, wp_list_pluck($descendants, 'ID'))) {
+                                unset($pages[$index]);
+                        }
+                }
         }
 
         if ( ! empty( $r['exclude_tree'] ) ) {

tests/phpunit/tests/post/getPages.php

@@ -509 +509 @@
                 $exclude6 = get_pages( array( 'exclude_tree' => array( $post_id1, $post_id3 ) ) );
                 $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' ) );
+        // }
 }