<!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>[22074] trunk/wp-includes/comment.php: Support meta queries 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, #logmsg > ol { margin-left: 0; 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/22074">22074</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2012-09-27 21:53:14 +0000 (Thu, 27 Sep 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Support meta queries in WP_Comment_Query.
Props nikolov.tmw
fixes <a href="http://core.trac.wordpress.org/ticket/21003">#21003</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludescommentphp">trunk/wp-includes/comment.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludescommentphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/comment.php (22073 => 22074)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/comment.php 2012-09-27 20:59:57 UTC (rev 22073)
+++ trunk/wp-includes/comment.php 2012-09-27 21:53:14 UTC (rev 22074)
</span><span class="lines">@@ -190,6 +190,14 @@
</span><span class="cx"> * @since 3.1.0
</span><span class="cx"> */
</span><span class="cx"> class WP_Comment_Query {
</span><ins>+ /**
+ * Metadata query container
+ *
+ * @since 3.?
+ * @access public
+ * @var object WP_Meta_Query
+ */
+ var $meta_query = false;
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Execute the query
</span><span class="lines">@@ -223,23 +231,33 @@
</span><span class="cx"> 'user_id' => '',
</span><span class="cx"> 'search' => '',
</span><span class="cx"> 'count' => false,
</span><ins>+ 'meta_key' => '',
+ 'meta_value' => '',
+ 'meta_query' => '',
</ins><span class="cx"> );
</span><span class="cx">
</span><ins>+ $groupby = '';
+
</ins><span class="cx"> $this->query_vars = wp_parse_args( $query_vars, $defaults );
</span><ins>+
+ // Parse meta query
+ $this->meta_query = new WP_Meta_Query();
+ $this->meta_query->parse_query_vars( $this->query_vars );
+
</ins><span class="cx"> do_action_ref_array( 'pre_get_comments', array( &$this ) );
</span><span class="cx"> extract( $this->query_vars, EXTR_SKIP );
</span><span class="cx">
</span><span class="cx"> // $args can be whatever, only use the args defined in defaults to compute the key
</span><span class="cx"> $key = md5( serialize( compact(array_keys($defaults)) ) );
</span><span class="cx"> $last_changed = wp_cache_get('last_changed', 'comment');
</span><del>- if ( !$last_changed ) {
</del><ins>+ if ( ! $last_changed ) {
</ins><span class="cx"> $last_changed = time();
</span><span class="cx"> wp_cache_set('last_changed', $last_changed, 'comment');
</span><span class="cx"> }
</span><span class="cx"> $cache_key = "get_comments:$key:$last_changed";
</span><span class="cx">
</span><span class="cx"> if ( $cache = wp_cache_get( $cache_key, 'comment' ) ) {
</span><del>- return $cache;
</del><ins>+ //return $cache;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $post_id = absint($post_id);
</span><span class="lines">@@ -257,26 +275,36 @@
</span><span class="cx">
</span><span class="cx"> if ( ! empty( $orderby ) ) {
</span><span class="cx"> $ordersby = is_array($orderby) ? $orderby : preg_split('/[,\s]/', $orderby);
</span><del>- $ordersby = array_intersect(
- $ordersby,
- array(
- 'comment_agent',
- 'comment_approved',
- 'comment_author',
- 'comment_author_email',
- 'comment_author_IP',
- 'comment_author_url',
- 'comment_content',
- 'comment_date',
- 'comment_date_gmt',
- 'comment_ID',
- 'comment_karma',
- 'comment_parent',
- 'comment_post_ID',
- 'comment_type',
- 'user_id',
- )
</del><ins>+ $allowed_keys = array(
+ 'comment_agent',
+ 'comment_approved',
+ 'comment_author',
+ 'comment_author_email',
+ 'comment_author_IP',
+ 'comment_author_url',
+ 'comment_content',
+ 'comment_date',
+ 'comment_date_gmt',
+ 'comment_ID',
+ 'comment_karma',
+ 'comment_parent',
+ 'comment_post_ID',
+ 'comment_type',
+ 'user_id',
</ins><span class="cx"> );
</span><ins>+ if ( ! empty( $this->query_vars['meta_key'] ) ) {
+ $allowed_keys[] = $q['meta_key'];
+ $allowed_keys[] = 'meta_value';
+ $allowed_keys[] = 'meta_value_num';
+ }
+ $ordersby = array_intersect( $ordersby, $allowed_keys );
+ foreach ( $ordersby as $key => $value ) {
+ if ( $value == $q['meta_key'] || $value == 'meta_value' ) {
+ $ordersby[ $key ] = "$wpdb->commentmeta.meta_value";
+ } elseif ( $value == 'meta_value_num' ) {
+ $ordersby[ $key ] = "$wpdb->commentmeta.meta_value+0";
+ }
+ }
</ins><span class="cx"> $orderby = empty( $ordersby ) ? 'comment_date_gmt' : implode(', ', $ordersby);
</span><span class="cx"> } else {
</span><span class="cx"> $orderby = 'comment_date_gmt';
</span><span class="lines">@@ -329,13 +357,23 @@
</span><span class="cx"> $where .= $wpdb->prepare( " AND {$wpdb->posts}.{$field_name} = %s", $field_value );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $pieces = array( 'fields', 'join', 'where', 'orderby', 'order', 'limits' );
</del><ins>+ if ( ! empty( $this->meta_query->queries ) ) {
+ $clauses = $this->meta_query->get_sql( 'comment', $wpdb->comments, 'comment_ID', $this );
+ $join .= $clauses['join'];
+ $where .= $clauses['where'];
+ $groupby = "{$wpdb->comments}.comment_ID";
+ }
+
+ $pieces = array( 'fields', 'join', 'where', 'orderby', 'order', 'limits', 'groupby' );
</ins><span class="cx"> $clauses = apply_filters_ref_array( 'comments_clauses', array( compact( $pieces ), &$this ) );
</span><span class="cx"> foreach ( $pieces as $piece )
</span><span class="cx"> $$piece = isset( $clauses[ $piece ] ) ? $clauses[ $piece ] : '';
</span><span class="cx">
</span><del>- $query = "SELECT $fields FROM $wpdb->comments $join WHERE $where ORDER BY $orderby $order $limits";
</del><ins>+ if ( $groupby )
+ $groupby = 'GROUP BY ' . $groupby;
</ins><span class="cx">
</span><ins>+ $query = "SELECT $fields FROM $wpdb->comments $join WHERE $where $groupby ORDER BY $orderby $order $limits";
+
</ins><span class="cx"> if ( $count )
</span><span class="cx"> return $wpdb->get_var( $query );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>