<!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>[30735] trunk: Give up on making uninterrupted hierarchies work in `get_page_children()` for now, reverts [30159], [30246], [30636].</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/30735">30735</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/30735","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>wonderboymusic</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2014-12-04 00:23:47 +0000 (Thu, 04 Dec 2014)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Give up on making uninterrupted hierarchies work in `get_page_children()` for now, reverts <a href="https://core.trac.wordpress.org/changeset/30159">[30159]</a>, <a href="https://core.trac.wordpress.org/changeset/30246">[30246]</a>, <a href="https://core.trac.wordpress.org/changeset/30636">[30636]</a>.
Props boonebgorges.
See <a href="https://core.trac.wordpress.org/ticket/14477">#14477</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 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/post.php 2014-12-03 21:59:53 UTC (rev 30734)
+++ trunk/src/wp-includes/post.php 2014-12-04 00:23:47 UTC (rev 30735)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4284,25 +4284,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function get_page_children( $page_id, $pages ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $page_list = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $pages as $page ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $page->post_parent == $page_id || in_array( $page_id, $page->ancestors ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $page->post_parent == $page_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $page_list[] = $page;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $children = get_page_children( $page->ID, $pages, false ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $children = get_page_children( $page->ID, $pages ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $page_list = array_merge( $page_list, $children );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Ensure uniqueness.
- $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;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $page_list;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4633,9 +4623,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Update cache.
</span><span class="cx" style="display: block; padding: 0 10px"> update_post_cache( $pages );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Convert to WP_Post instances
- $pages = array_map( 'get_post', $pages );
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( $child_of || $hierarchical ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $pages = get_page_children($child_of, $pages);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4664,6 +4651,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_set( $cache_key, $page_structure, 'posts' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Convert to WP_Post instances
+ $pages = array_map( 'get_post', $pages );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filter the retrieved list of pages.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunktestsphpunittestspostgetPagesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/post/getPages.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/getPages.php 2014-12-03 21:59:53 UTC (rev 30734)
+++ trunk/tests/phpunit/tests/post/getPages.php 2014-12-04 00:23:47 UTC (rev 30735)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -270,18 +270,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $exclude6 = get_pages( array( 'exclude_tree' => array( $post_id1, $post_id3 ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 2, $exclude6 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- /**
- * @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' ) );
- }
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>