<!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>[37225] trunk: Query: Allow results to be ordered by `post_parent__in`.</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/37225">37225</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/37225","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>boonebgorges</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-04-17 03:16:36 +0000 (Sun, 17 Apr 2016)</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'>Query: Allow results to be ordered by `post_parent__in`.
Props postpostmodern.
Fixes <a href="https://core.trac.wordpress.org/ticket/36515">#36515</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesqueryphp">trunk/src/wp-includes/query.php</a></li>
<li><a href="#trunktestsphpunittestspostqueryphp">trunk/tests/phpunit/tests/post/query.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesqueryphp"></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/query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/query.php 2016-04-17 03:12:39 UTC (rev 37224)
+++ trunk/src/wp-includes/query.php 2016-04-17 03:16:36 UTC (rev 37225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1468,6 +1468,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.5.0 Removed the `$comments_popup` parameter.
</span><span class="cx" style="display: block; padding: 0 10px"> * Introduced the `$comment_status` and `$ping_status` parameters.
</span><span class="cx" style="display: block; padding: 0 10px"> * Introduced `RAND(x)` syntax for `$orderby`, which allows an integer seed value to random sorts.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 4.6.0 Added 'post_name__in' support for `$orderby`.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @access public
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string|array $query {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1523,7 +1524,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * 'title', 'modified', 'menu_order', 'parent', 'ID', 'rand',
</span><span class="cx" style="display: block; padding: 0 10px"> * 'RAND(x)' (where 'x' is an integer seed value),
</span><span class="cx" style="display: block; padding: 0 10px"> * 'comment_count', 'meta_value', 'meta_value_num', 'post__in',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * and the array keys of `$meta_query`.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * 'post_name__in', 'post_parent__in', and the array keys
+ * of `$meta_query`.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @type int $p Post ID.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type int $page Show the number of posts that would show up on page X of a
</span><span class="cx" style="display: block; padding: 0 10px"> * static front page.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2745,7 +2747,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $where .= " AND $wpdb->posts.post_name = '" . $q['attachment'] . "'";
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( is_array( $q['post_name__in'] ) && ! empty( $q['post_name__in'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $q['post_name__in'] = array_map( 'sanitize_title_for_query', $q['post_name__in'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where .= " AND $wpdb->posts.post_name IN ('" . implode( "' ,'", $q['post_name__in'] ) . "')";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_name__in = "'" . implode( "','", $q['post_name__in'] ) . "'";
+ $where .= " AND $wpdb->posts.post_name IN ($post_name__in)";
</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"> // If an attachment is requested by number, let it supersede any post number.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2963,6 +2966,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $orderby = "FIELD( {$wpdb->posts}.ID, $post__in )";
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $q['orderby'] == 'post_parent__in' && ! empty( $post_parent__in ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $orderby = "FIELD( {$wpdb->posts}.post_parent, $post_parent__in )";
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( $q['orderby'] == 'post_name__in' && ! empty( $post_name__in ) ) {
+ $orderby = "FIELD( {$wpdb->posts}.post_name, $post_name__in )";
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $orderby_array = array();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $q['orderby'] ) ) {
</span></span></pre></div>
<a id="trunktestsphpunittestspostqueryphp"></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/query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/query.php 2016-04-17 03:12:39 UTC (rev 37224)
+++ trunk/tests/phpunit/tests/post/query.php 2016-04-17 03:16:36 UTC (rev 37225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -178,6 +178,29 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEqualSets( $ordered, wp_list_pluck( $attached->posts, 'ID' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @ticket 36515
+ */
+ public function test_post_name__in_ordering() {
+ $post_id1 = self::factory()->post->create( array( 'post_name' => 'id-1', 'post_type' => 'page' ) );
+ $post_id2 = self::factory()->post->create( array( 'post_name' => 'id-2', 'post_type' => 'page' ) );
+ $post_id3 = self::factory()->post->create( array(
+ 'post_name' => 'id-3',
+ 'post_type' => 'page',
+ 'post_parent' => $post_id2
+ ) );
+
+ $ordered = array( 'id-2', 'id-3', 'id-1' );
+
+ $q = new WP_Query( array(
+ 'post_type' => 'any',
+ 'post_name__in' => $ordered,
+ 'orderby' => 'post_name__in'
+ ) );
+
+ $this->assertSame( $ordered, wp_list_pluck( $q->posts, 'post_name' ) );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> function test_post_status() {
</span><span class="cx" style="display: block; padding: 0 10px"> $statuses1 = get_post_stati();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( 'auto-draft', $statuses1 );
</span></span></pre>
</div>
</div>
</body>
</html>