Changeset 30735

Timestamp:

12/04/2014 12:23:47 AM (9 years ago)

Author:

wonderboymusic

Message:

Give up on making uninterrupted hierarchies work in get_page_children() for now, reverts [30159], [30246], [30636].

Props boonebgorges.
See #14477.

Location:

trunk

Files:

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

trunk/src/wp-includes/post.php

@@ -4285 +4285 @@
     $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 );
             }
@@ -4293 +4293 @@
     }
 
-    // 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;
 }
 
@@ -4634 +4624 @@
     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 +4651 @@
 
     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

@@ -271 +271 @@
         $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' ) );
-    }
 }