Changeset 30636 for trunk/src/wp-includes/post.php

Timestamp:

11/30/2014 06:04:31 AM (10 years ago)

Author:

wonderboymusic

Message:

Ensure uniqueness when returning page lists in get_page_children(). Fixes failing unit tests.

Props boonebgorges.
Reverts [30246].
Fixes #14477.

File:

• trunk/src/wp-includes/post.php (modified) (2 diffs)

trunk/src/wp-includes/post.php

@@ -4281 +4281 @@
  * @param int   $page_id    Page ID.
  * @param array $pages      List of pages' objects.
- * @param bool  $ancestors  Whether to check a page's ancestors.
  * @return array List of page children.
  */
-function get_page_children( $page_id, $pages, $ancestors = true ) {
+function get_page_children( $page_id, $pages ) {
     $page_list = array();
     foreach ( (array) $pages as $page ) {
-        if ( $page->post_parent == $page_id || ( $ancestors && in_array( $page_id, $page->ancestors ) ) ) {
+        if ( $page->post_parent == $page_id || in_array( $page_id, $page->ancestors ) ) {
             $page_list[] = $page;
             if ( $children = get_page_children( $page->ID, $pages, false ) ) {
@@ -4294 +4293 @@
         }
     }
-    return $page_list;
+
+    // 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;
 }