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

Use wp_parse_id_list() when parsing exclude_tree in get_pages(). Add unit tests to ensure a URL string, array with string as value, and array with array as value for exclude_tree can be used to specify multiple IDs.

Browse Source 
Props cgaffga, roothorick, hakre, tbrams for patches across the years.
Fixes #9153.



git-svn-id: https://develop.svn.wordpress.org/trunk@27767 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Scott Taylor 2014-03-27 01:17:41 +00:00
parent 42055c8c93
commit 115f291221
2 changed files with 46 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3742,7 +3742,7 @@ function get_pages( $args = array() ) {
'sort_column' => 'post_title', 'hierarchical' => 1, 'sort_column' => 'post_title', 'hierarchical' => 1,
'exclude' => array(), 'include' => array(), 'exclude' => array(), 'include' => array(),
'meta_key' => '', 'meta_value' => '', 'meta_key' => '', 'meta_value' => '',
'authors' => '', 'parent' => -1, 'exclude_tree' => '', 'authors' => '', 'parent' => -1, 'exclude_tree' => array(),
'number' => '', 'offset' => 0, 'number' => '', 'offset' => 0,
'post_type' => 'page', 'post_status' => 'publish', 'post_type' => 'page', 'post_status' => 'publish',
); );
@ -3924,17 +3924,20 @@ function get_pages( $args = array() ) {
if ( $child_of || $hierarchical ) if ( $child_of || $hierarchical )
$pages = get_page_children($child_of, $pages); $pages = get_page_children($child_of, $pages);
if ( !empty($exclude_tree) ) { if ( ! empty( $exclude_tree ) ) {
$exclude = (int) $exclude_tree; $exclude = wp_parse_id_list( $exclude_tree );
$children = get_page_children($exclude, $pages); foreach( $exclude as $id ) {
$excludes = array(); $children = get_page_children( $id, $pages );
foreach ( $children as $child ) foreach ( $children as $child ) {
$excludes[] = $child->ID; $exclude[] = $child->ID;
$excludes[] = $exclude; }
$num_pages = count($pages); }
$num_pages = count( $pages );
for ( $i = 0; $i < $num_pages; $i++ ) { for ( $i = 0; $i < $num_pages; $i++ ) {
if ( in_array($pages[$i]->ID, $excludes) ) if ( in_array( $pages[$i]->ID, $exclude ) ) {
unset($pages[$i]); unset( $pages[$i] );
}
} }
} }

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

@ -236,4 +236,36 @@ class Tests_Post_getPages extends WP_UnitTestCase {
_unregister_post_type( $type ); _unregister_post_type( $type );
} }
function test_exclude_tree() {
$post_id1 = $this->factory->post->create( array( 'post_type' => 'page' ) );
$post_id2 = $this->factory->post->create( array( 'post_type' => 'page', 'post_parent' => $post_id1 ) );
$post_id3 = $this->factory->post->create( array( 'post_type' => 'page' ) );
$post_id4 = $this->factory->post->create( array( 'post_type' => 'page', 'post_parent' => $post_id3 ) );
$all = get_pages();
$this->assertCount( 4, $all );
$exclude1 = get_pages( "exclude_tree=$post_id1" );
$this->assertCount( 2, $exclude1 );
$exclude2 = get_pages( array( 'exclude_tree' => $post_id1 ) );
$this->assertCount( 2, $exclude2 );
$exclude3 = get_pages( array( 'exclude_tree' => array( $post_id1 ) ) );
$this->assertCount( 2, $exclude3 );
$exclude4 = get_pages( array( 'exclude_tree' => array( $post_id1, $post_id2 ) ) );
$this->assertCount( 2, $exclude4 );
$exclude5 = get_pages( array( 'exclude_tree' => array( $post_id1, $post_id3 ) ) );
$this->assertCount( 0, $exclude5 );
$post_id5 = $this->factory->post->create( array( 'post_type' => 'page' ) );
$post_id6 = $this->factory->post->create( array( 'post_type' => 'page', 'post_parent' => $post_id5 ) );
$exclude6 = get_pages( array( 'exclude_tree' => array( $post_id1, $post_id3 ) ) );
$this->assertCount( 2, $exclude6 );
}
} }