<!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>[34212] trunk: `WP_Comment_Query`: add `comment__in` to allowed values for `$orderby`.</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/34212">34212</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/34212","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>2015-09-15 16:34:14 +0000 (Tue, 15 Sep 2015)</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'>`WP_Comment_Query`: add `comment__in` to allowed values for `$orderby`.
Adds unit tests.
Fixes <a href="https://core.trac.wordpress.org/ticket/33883">#33883</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswpcommentqueryphp">trunk/src/wp-includes/class-wp-comment-query.php</a></li>
<li><a href="#trunktestsphpunittestscommentqueryphp">trunk/tests/phpunit/tests/comment/query.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclasswpcommentqueryphp"></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/class-wp-comment-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-comment-query.php 2015-09-15 16:26:15 UTC (rev 34211)
+++ trunk/src/wp-includes/class-wp-comment-query.php 2015-09-15 16:34:14 UTC (rev 34212)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,6 +94,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.2.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.4.0 `$parent__in` and `$parent__not_in` were added.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 4.4.0 Order by `comment__in` was added.
</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">@@ -130,7 +131,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * 'comment_author_url', 'comment_content', 'comment_date',
</span><span class="cx" style="display: block; padding: 0 10px"> * 'comment_date_gmt', 'comment_ID', 'comment_karma',
</span><span class="cx" style="display: block; padding: 0 10px"> * 'comment_parent', 'comment_post_ID', 'comment_type', 'user_id',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * 'meta_value', 'meta_value_num', the value of $meta_key, and the
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * 'comment__in', 'meta_value', 'meta_value_num', the value of $meta_key, and the
</ins><span class="cx" style="display: block; padding: 0 10px"> * array keys of `$meta_query`. Also accepts false, an empty array,
</span><span class="cx" style="display: block; padding: 0 10px"> * or 'none' to disable `ORDER BY` clause.
</span><span class="cx" style="display: block; padding: 0 10px"> * Default: 'comment_date_gmt'.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -390,7 +391,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $_order = $_value;
</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">- if ( ! $found_orderby_comment_ID && 'comment_ID' === $_orderby ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $found_orderby_comment_ID && in_array( $_orderby, array( 'comment_ID', 'comment__in' ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $found_orderby_comment_ID = true;
</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">@@ -400,6 +401,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</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">+ if ( 'comment__in' === $_orderby ) {
+ $orderby_array[] = $parsed;
+ continue;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $orderby_array[] = $parsed . ' ' . $this->parse_order( $_order );
</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">@@ -772,6 +778,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $parsed = "$wpdb->commentmeta.meta_value";
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $orderby == 'meta_value_num' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $parsed = "$wpdb->commentmeta.meta_value+0";
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( $orderby == 'comment__in' ) {
+ $comment__in = implode( ',', array_map( 'absint', $this->query_vars['comment__in'] ) );
+ $parsed = "FIELD( {$wpdb->comments}.comment_ID, $comment__in )";
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( in_array( $orderby, $allowed_keys ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $meta_query_clauses[ $orderby ] ) ) {
</span></span></pre></div>
<a id="trunktestsphpunittestscommentqueryphp"></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/comment/query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment/query.php 2015-09-15 16:26:15 UTC (rev 34211)
+++ trunk/tests/phpunit/tests/comment/query.php 2015-09-15 16:34:14 UTC (rev 34212)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1837,4 +1837,38 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEqualSets( array( $c1, $c2 ), $ids->comments );
</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 33883
+ */
+ public function test_orderby_comment__in() {
+ $this->factory->comment->create( array(
+ 'comment_post_ID' => $this->post_id,
+ 'comment_approved' => '1'
+ ) );
+
+ $c2 = $this->factory->comment->create( array(
+ 'comment_post_ID' => $this->post_id,
+ 'comment_approved' => '1'
+ ) );
+ $c3 = $this->factory->comment->create( array(
+ 'comment_post_ID' => $this->post_id,
+ 'comment_approved' => '1'
+ ) );
+
+ $this->factory->comment->create( array(
+ 'comment_post_ID' => $this->post_id,
+ 'comment_approved' => '1'
+ ) );
+
+
+ $ids = new WP_Comment_Query( array(
+ 'fields' => 'ids',
+ 'comment__in' => array( $c2, $c3 ),
+ 'orderby' => 'comment__in'
+ ) );
+
+ $this->assertEquals( array( $c2, $c3 ), $ids->comments );
+
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>