diff --git a/src/wp-includes/post.php b/src/wp-includes/post.php index a72c5ca35c..c8963e6b2d 100644 --- a/src/wp-includes/post.php +++ b/src/wp-includes/post.php @@ -4284,25 +4284,15 @@ function get_page_by_title( $page_title, $output = OBJECT, $post_type = 'page' ) function get_page_children( $page_id, $pages ) { $page_list = array(); foreach ( (array) $pages as $page ) { - if ( $page->post_parent == $page_id || in_array( $page_id, $page->ancestors ) ) { + if ( $page->post_parent == $page_id ) { $page_list[] = $page; - if ( $children = get_page_children( $page->ID, $pages, false ) ) { + if ( $children = get_page_children( $page->ID, $pages ) ) { $page_list = array_merge( $page_list, $children ); } } } - // Ensure uniqueness. - $page_ids = array(); - $unique_page_list = array(); - foreach ( $page_list as $page_list_item ) { - if ( ! in_array( $page_list_item->ID, $page_ids ) ) { - $unique_page_list[] = $page_list_item; - $page_ids[] = $page_list_item->ID; - } - } - - return $unique_page_list; + return $page_list; } /** @@ -4633,9 +4623,6 @@ function get_pages( $args = array() ) { // 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); } @@ -4664,6 +4651,9 @@ function get_pages( $args = array() ) { 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. * diff --git a/tests/phpunit/tests/post/getPages.php b/tests/phpunit/tests/post/getPages.php index 6a8d9342a7..4f4f4736d8 100644 --- a/tests/phpunit/tests/post/getPages.php +++ b/tests/phpunit/tests/post/getPages.php @@ -270,18 +270,4 @@ class Tests_Post_getPages extends WP_UnitTestCase { $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' ) ); - } }