sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

In `get_page_children()`, only check `$page->ancestors` once to avoid duplicates when the function recurses. Adds an argument, `$ancestors`. 

Fixes #18962.


git-svn-id: https://develop.svn.wordpress.org/trunk@30246 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Scott Taylor 2014-11-05 20:04:55 +00:00
parent 885502ecab
commit 5a2c0fef1e
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/wp-includes/post.php
View File

@ -4278,17 +4278,19 @@ function get_page_by_title( $page_title, $output = OBJECT, $post_type = 'page' )
*
* @since 1.5.1
*
* @param int $page_id Page ID.
* @param array $pages List of pages' objects.
* @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) {
function get_page_children( $page_id, $pages, $ancestors = true ) {
$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 || ( $ancestors && in_array( $page_id, $page->ancestors ) ) ) {
$page_list[] = $page;
if ( $children = get_page_children($page->ID, $pages) )
$page_list = array_merge($page_list, $children);
if ( $children = get_page_children( $page->ID, $pages, false ) ) {
$page_list = array_merge( $page_list, $children );
}
}
}
return $page_list;