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

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

Browse Source 
Props boonebgorges.
See #14477.


git-svn-id: https://develop.svn.wordpress.org/trunk@30735 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Scott Taylor 2014-12-04 00:23:47 +00:00
parent 86c494d1b5
commit e37fb988b1
2 changed files with 6 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4284,25 +4284,15 @@ function get_page_by_title( $page_title, $output = OBJECT, $post_type = 'page' )
function get_page_children( $page_id, $pages ) { 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 || in_array( $page_id, $page->ancestors ) ) { if ( $page->post_parent == $page_id ) {
$page_list[] = $page; $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 ); $page_list = array_merge( $page_list, $children );
} }
} }
} }
// Ensure uniqueness. return $page_list;
$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;
} }
/** /**
@ -4633,9 +4623,6 @@ function get_pages( $args = array() ) {
// Update cache. // Update cache.
update_post_cache( $pages ); update_post_cache( $pages );
// Convert to WP_Post instances
$pages = array_map( 'get_post', $pages );
if ( $child_of || $hierarchical ) { if ( $child_of || $hierarchical ) {
$pages = get_page_children($child_of, $pages); $pages = get_page_children($child_of, $pages);
} }
@ -4664,6 +4651,9 @@ function get_pages( $args = array() ) {
wp_cache_set( $cache_key, $page_structure, 'posts' ); 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. * Filter the retrieved list of pages.
* *

14
tests/phpunit/tests/post/getPages.php
View File

@ -270,18 +270,4 @@ class Tests_Post_getPages extends WP_UnitTestCase {
$exclude6 = get_pages( array( 'exclude_tree' => array( $post_id1, $post_id3 ) ) ); $exclude6 = get_pages( array( 'exclude_tree' => array( $post_id1, $post_id3 ) ) );
$this->assertCount( 2, $exclude6 ); $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' ) );
}
} }