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

Allow `get_pages()`, with `child_of` passed to it, to work with interrupted hierarchies. 

Adds unit test.
Fixes #18962.


git-svn-id: https://develop.svn.wordpress.org/trunk@30159 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Scott Taylor 2014-11-01 20:43:55 +00:00
parent 59658c6547
commit 4315c9c5c3
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4285,7 +4285,7 @@ function get_page_by_title( $page_title, $output = OBJECT, $post_type = 'page' )
function get_page_children($page_id, $pages) {
$page_list = array();
foreach ( (array) $pages as $page ) {
if ( $page->post_parent == $page_id ) {
if ( $page->post_parent == $page_id || in_array( $page_id, $page->ancestors ) ) {
$page_list[] = $page;
if ( $children = get_page_children($page->ID, $pages) )
$page_list = array_merge($page_list, $children);
@ -4619,6 +4619,9 @@ function get_pages( $args = array() ) {
// Update cache.
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);
}
@ -4647,9 +4650,6 @@ function get_pages( $args = array() ) {
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.
*

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

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