WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

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

Built from https://develop.svn.wordpress.org/trunk@30636


git-svn-id: http://core.svn.wordpress.org/trunk@30626 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2014-11-30 06:05:24 +00:00
parent 1e10385a90
commit d12eb2e38e
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
wp-includes/post.php
View File

@ -4280,20 +4280,30 @@ function get_page_by_title( $page_title, $output = OBJECT, $post_type = 'page' )
* *
* @param int $page_id Page ID. * @param int $page_id Page ID.
* @param array $pages List of pages' objects. * @param array $pages List of pages' objects.
* @param bool $ancestors Whether to check a page's ancestors.
* @return array List of page children. * @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(); $page_list = array();
foreach ( (array) $pages as $page ) { 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; $page_list[] = $page;
if ( $children = get_page_children( $page->ID, $pages, false ) ) { if ( $children = get_page_children( $page->ID, $pages, false ) ) {
$page_list = array_merge( $page_list, $children ); $page_list = array_merge( $page_list, $children );
} }
} }
} }
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;
} }
/** /**

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.1-beta2-30635'; $wp_version = '4.1-beta2-30636';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.