<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[27767] trunk: Use `wp_parse_id_list()` when parsing `exclude_tree` in `get_pages()`.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/27767">27767</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-03-27 01:17:41 +0000 (Thu, 27 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.
Props cgaffga, roothorick, hakre, tbrams for patches across the years.
Fixes <a href="http://core.trac.wordpress.org/ticket/9153">#9153</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludespostphp">trunk/src/wp-includes/post.php</a></li>
<li><a href="#trunktestsphpunittestspostgetPagesphp">trunk/tests/phpunit/tests/post/getPages.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/post.php (27766 => 27767)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/post.php 2014-03-27 01:13:44 UTC (rev 27766)
+++ trunk/src/wp-includes/post.php 2014-03-27 01:17:41 UTC (rev 27767)
</span><span class="lines">@@ -3742,7 +3742,7 @@
</span><span class="cx"> 'sort_column' => 'post_title', 'hierarchical' => 1,
</span><span class="cx"> 'exclude' => array(), 'include' => array(),
</span><span class="cx"> 'meta_key' => '', 'meta_value' => '',
</span><del>- 'authors' => '', 'parent' => -1, 'exclude_tree' => '',
</del><ins>+ 'authors' => '', 'parent' => -1, 'exclude_tree' => array(),
</ins><span class="cx"> 'number' => '', 'offset' => 0,
</span><span class="cx"> 'post_type' => 'page', 'post_status' => 'publish',
</span><span class="cx"> );
</span><span class="lines">@@ -3924,17 +3924,20 @@
</span><span class="cx"> if ( $child_of || $hierarchical )
</span><span class="cx"> $pages = get_page_children($child_of, $pages);
</span><span class="cx">
</span><del>- if ( !empty($exclude_tree) ) {
- $exclude = (int) $exclude_tree;
- $children = get_page_children($exclude, $pages);
- $excludes = array();
- foreach ( $children as $child )
- $excludes[] = $child->ID;
- $excludes[] = $exclude;
- $num_pages = count($pages);
</del><ins>+ if ( ! empty( $exclude_tree ) ) {
+ $exclude = wp_parse_id_list( $exclude_tree );
+ foreach( $exclude as $id ) {
+ $children = get_page_children( $id, $pages );
+ foreach ( $children as $child ) {
+ $exclude[] = $child->ID;
+ }
+ }
+
+ $num_pages = count( $pages );
</ins><span class="cx"> for ( $i = 0; $i < $num_pages; $i++ ) {
</span><del>- if ( in_array($pages[$i]->ID, $excludes) )
- unset($pages[$i]);
</del><ins>+ if ( in_array( $pages[$i]->ID, $exclude ) ) {
+ unset( $pages[$i] );
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunktestsphpunittestspostgetPagesphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/post/getPages.php (27766 => 27767)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/post/getPages.php 2014-03-27 01:13:44 UTC (rev 27766)
+++ trunk/tests/phpunit/tests/post/getPages.php 2014-03-27 01:17:41 UTC (rev 27767)
</span><span class="lines">@@ -236,4 +236,36 @@
</span><span class="cx">
</span><span class="cx"> _unregister_post_type( $type );
</span><span class="cx"> }
</span><ins>+
+ 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 );
+ }
</ins><span class="cx"> }
</span><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>