<!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>[30084] trunk: Support multiple 'status' values in `WP_Comment_Query`.</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/30084">30084</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/30084","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>2014-10-29 02:21:10 +0000 (Wed, 29 Oct 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'>Support multiple 'status' values in `WP_Comment_Query`.
This change required turning the SQL concatenation into the generation of an
array, for greater flexibility.
Props karpstrucking, ebinnion.
Fixes <a href="https://core.trac.wordpress.org/ticket/29612">#29612</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludescommentphp">trunk/src/wp-includes/comment.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="trunksrcwpincludescommentphp"></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/comment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/comment.php 2014-10-29 01:20:03 UTC (rev 30083)
+++ trunk/src/wp-includes/comment.php 2014-10-29 02:21:10 UTC (rev 30084)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -302,7 +302,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_parent' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => '',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'status' => '',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'status' => 'all',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'type' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_id' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'search' => '',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -343,19 +343,48 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $cache;
</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">+ $where = array();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Assemble clauses related to 'comment_approved'.
</span><span class="cx" style="display: block; padding: 0 10px"> $approved_clauses = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $status = $this->query_vars['status'];
- if ( 'hold' == $status ) {
- $approved_clauses[] = "comment_approved = '0'";
- } elseif ( 'approve' == $status ) {
- $approved_clauses[] = "comment_approved = '1'";
- } elseif ( ! empty( $status ) && 'all' != $status ) {
- $approved_clauses[] = $wpdb->prepare( "comment_approved = %s", $status );
- } else {
- $approved_clauses[] = "( comment_approved = '0' OR comment_approved = '1' )";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // 'status' accepts an array or a comma-separated string.
+ $status_clauses = array();
+ $statuses = $this->query_vars['status'];
+ if ( ! is_array( $statuses ) ) {
+ $statuses = preg_split( '/[\s,]+/', $statuses );
</ins><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">+ // Remove empty statuses.
+ $statuses = array_filter( $statuses );
+
+ // 'any' overrides other statuses.
+ if ( ! in_array( 'any', $statuses ) ) {
+ foreach ( $statuses as $status ) {
+ switch ( $status ) {
+ case 'hold' :
+ $status_clauses[] = "comment_approved = '0'";
+ break;
+
+ case 'approve' :
+ $status_clauses[] = "comment_approved = '1'";
+ break;
+
+ case 'all' :
+ $status_clauses[] = "( comment_approved = '0' OR comment_approved = '1' )";
+ break;
+
+ default :
+ $status_clauses[] = $wpdb->prepare( "comment_approved = %s", $status );
+ break;
+ }
+ }
+
+ if ( ! empty( $status_clauses ) ) {
+ $approved_clauses[] = '( ' . implode( ' OR ', $status_clauses ) . ' )';
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // User IDs or emails whose unapproved comments are included, regardless of $status.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $this->query_vars['include_unapproved'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $include_unapproved = $this->query_vars['include_unapproved'];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -379,10 +408,12 @@
</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"> // Collapse comment_approved clauses into a single OR-separated clause.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 1 === count( $approved_clauses ) ) {
- $approved = $approved_clauses[0];
- } else {
- $approved = '( ' . implode( ' OR ', $approved_clauses ) . ' )';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $approved_clauses ) ) {
+ if ( 1 === count( $approved_clauses ) ) {
+ $where[] = $approved_clauses[0];
+ } else {
+ $where[] = '( ' . implode( ' OR ', $approved_clauses ) . ' )';
+ }
</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"> $order = ( 'ASC' == strtoupper( $this->query_vars['order'] ) ) ? 'ASC' : 'DESC';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -457,64 +488,66 @@
</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"> $join = '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where = $approved;
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = absint( $this->query_vars['post_id'] );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $post_id ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where .= $wpdb->prepare( ' AND comment_post_ID = %d', $post_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where[] = $wpdb->prepare( 'comment_post_ID = %d', $post_id );
</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"> // Parse comment IDs for an IN clause.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $this->query_vars['comment__in'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where .= ' AND comment_ID IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['comment__in'] ) ) . ' )';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where[] = 'comment_ID IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['comment__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"> // Parse comment IDs for a NOT IN clause.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $this->query_vars['comment__not_in'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where .= ' AND comment_ID NOT IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['comment__not_in'] ) ) . ' )';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where[] = 'comment_ID NOT IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['comment__not_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"> // Parse comment post IDs for an IN clause.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $this->query_vars['post__in'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where .= ' AND comment_post_ID IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['post__in'] ) ) . ' )';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where[] = 'comment_post_ID IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['post__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"> // Parse comment post IDs for a NOT IN clause.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $this->query_vars['post__not_in'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where .= ' AND comment_post_ID NOT IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['post__not_in'] ) ) . ' )';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where[] = 'comment_post_ID NOT IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['post__not_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 ( '' !== $this->query_vars['author_email'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where .= $wpdb->prepare( ' AND comment_author_email = %s', $this->query_vars['author_email'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where[] = $wpdb->prepare( 'comment_author_email = %s', $this->query_vars['author_email'] );
</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 ( '' !== $this->query_vars['karma'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where .= $wpdb->prepare( ' AND comment_karma = %d', $this->query_vars['karma'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where[] = $wpdb->prepare( 'comment_karma = %d', $this->query_vars['karma'] );
</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 ( 'comment' == $this->query_vars['type'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where .= " AND comment_type = ''";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where[] = "comment_type = ''";
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif( 'pings' == $this->query_vars['type'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where .= ' AND comment_type IN ("pingback", "trackback")';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where[] = 'comment_type IN ("pingback", "trackback")';
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! empty( $this->query_vars['type'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where .= $wpdb->prepare( ' AND comment_type = %s', $this->query_vars['type'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where[] = $wpdb->prepare( 'comment_type = %s', $this->query_vars['type'] );
</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 ( '' !== $this->query_vars['parent'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where .= $wpdb->prepare( ' AND comment_parent = %d', $this->query_vars['parent'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where[] = $wpdb->prepare( 'comment_parent = %d', $this->query_vars['parent'] );
</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 ( is_array( $this->query_vars['user_id'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where .= ' AND user_id IN (' . implode( ',', array_map( 'absint', $this->query_vars['user_id'] ) ) . ')';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where[] = 'user_id IN (' . implode( ',', array_map( 'absint', $this->query_vars['user_id'] ) ) . ')';
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( '' !== $this->query_vars['user_id'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where .= $wpdb->prepare( ' AND user_id = %d', $this->query_vars['user_id'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where[] = $wpdb->prepare( 'user_id = %d', $this->query_vars['user_id'] );
</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 ( '' !== $this->query_vars['search'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where .= $this->get_search_sql(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $search_sql = $this->get_search_sql(
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->query_vars['search'],
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_author_IP', 'comment_content' )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Strip leading 'AND'.
+ $where[] = preg_replace( '/^\s*AND\s*/', '', $search_sql );
</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 any post-related query vars are passed, join the posts table.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -525,30 +558,30 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $post_fields ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $join_posts_table = true;
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $post_fields as $field_name => $field_value ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where .= $wpdb->prepare( " AND {$wpdb->posts}.{$field_name} = %s", $field_value );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where[] = $wpdb->prepare( " {$wpdb->posts}.{$field_name} = %s", $field_value );
</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="cx" style="display: block; padding: 0 10px"> // Comment author IDs for an IN clause.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $this->query_vars['author__in'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where .= ' AND user_id IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['author__in'] ) ) . ' )';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where[] = 'user_id IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['author__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"> // Comment author IDs for a NOT IN clause.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $this->query_vars['author__not_in'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where .= ' AND user_id NOT IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['author__not_in'] ) ) . ' )';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where[] = 'user_id NOT IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['author__not_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"> // Post author IDs for an IN clause.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $this->query_vars['post_author__in'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $join_posts_table = true;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where .= ' AND post_author IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['post_author__in'] ) ) . ' )';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where[] = 'post_author IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['post_author__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"> // Post author IDs for a NOT IN clause.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $this->query_vars['post_author__not_in'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $join_posts_table = true;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where .= ' AND post_author NOT IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['post_author__not_in'] ) ) . ' )';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where[] = 'post_author NOT IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['post_author__not_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 ( $join_posts_table ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -558,8 +591,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $this->meta_query->queries ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $clauses = $this->meta_query->get_sql( 'comment', $wpdb->comments, 'comment_ID', $this );
</span><span class="cx" style="display: block; padding: 0 10px"> $join .= $clauses['join'];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where .= $clauses['where'];
</del><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Strip leading 'AND'.
+ $where[] = preg_replace( '/^\s*AND\s*/', '', $clauses['where'] );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $this->query_vars['count'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $groupby = "{$wpdb->comments}.comment_ID";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -568,9 +603,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $date_query = $this->query_vars['date_query'];
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $date_query ) && is_array( $date_query ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $date_query_object = new WP_Date_Query( $date_query, 'comment_date' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where .= $date_query_object->get_sql();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where[] = preg_replace( '/^\s*AND\s*/', '', $date_query_object->get_sql() );
</ins><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">+ $where = implode( ' AND ', $where );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $pieces = array( 'fields', 'join', 'where', 'orderby', 'order', 'limits', 'groupby' );
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filter the comment query clauses.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -590,6 +627,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $limits = isset( $clauses[ 'limits' ] ) ? $clauses[ 'limits' ] : '';
</span><span class="cx" style="display: block; padding: 0 10px"> $groupby = isset( $clauses[ 'groupby' ] ) ? $clauses[ 'groupby' ] : '';
</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 ( $where ) {
+ $where = 'WHERE ' . $where;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $groupby ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $groupby = 'GROUP BY ' . $groupby;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -598,7 +639,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $orderby = "ORDER BY $orderby $order";
</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">- $this->request = "SELECT $fields FROM $wpdb->comments $join WHERE $where $groupby $orderby $limits";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->request = "SELECT $fields FROM $wpdb->comments $join $where $groupby $orderby $limits";
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->query_vars['count'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $wpdb->get_var( $this->request );
</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 2014-10-29 01:20:03 UTC (rev 30083)
+++ trunk/tests/phpunit/tests/comment/query.php 2014-10-29 02:21:10 UTC (rev 30084)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,6 +75,70 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEqualSets( array( $c1, $c3 ), $found );
</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">+ public function test_status_default_to_all() {
+ $c1 = $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' => 'foo' ) );
+ $c3 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '0' ) );
+
+ $q = new WP_Comment_Query();
+ $found = $q->query( array(
+ 'fields' => 'ids',
+ ) );
+
+ $this->assertEqualSets( array( $c1, $c3 ), $found );
+ }
+
+ /**
+ * @ticket 29612
+ */
+ public function test_status_comma_any() {
+ $c1 = $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' => 'foo' ) );
+ $c3 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '0' ) );
+
+ $q = new WP_Comment_Query();
+ $found = $q->query( array(
+ 'status' => 'any',
+ 'fields' => 'ids',
+ ) );
+
+ $this->assertEqualSets( array( $c1, $c2, $c3 ), $found );
+ }
+
+ /**
+ * @ticket 29612
+ */
+ public function test_status_comma_separated() {
+ $c1 = $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' => 'foo' ) );
+ $c3 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '0' ) );
+
+ $q = new WP_Comment_Query();
+ $found = $q->query( array(
+ 'status' => 'approve,foo,bar',
+ 'fields' => 'ids',
+ ) );
+
+ $this->assertEqualSets( array( $c1, $c2 ), $found );
+ }
+
+ /**
+ * @ticket 29612
+ */
+ public function test_status_array() {
+ $c1 = $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' => 'foo' ) );
+ $c3 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '0' ) );
+
+ $q = new WP_Comment_Query();
+ $found = $q->query( array(
+ 'status' => array( 'approve', 'foo', 'bar', ),
+ 'fields' => 'ids',
+ ) );
+
+ $this->assertEqualSets( array( $c1, $c2 ), $found );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> function test_get_comments_for_post() {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = $this->factory->post->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->factory->comment->create_post_comments( $post_id, 10 );
</span></span></pre>
</div>
</div>
</body>
</html>