<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[16020] trunk/wp-includes/comment.php:
Make comment clauses more similar to post clauses.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16020">16020</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-10-27 19:05:39 +0000 (Wed, 27 Oct 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make comment clauses more similar to post clauses. See <a href="http://trac.wordpress.org/ticket/15019">#15019</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 (16019 => 16020)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/comment.php 2010-10-27 18:49:45 UTC (rev 16019)
+++ trunk/wp-includes/comment.php 2010-10-27 19:05:39 UTC (rev 16020)
</span><span class="lines">@@ -292,15 +292,21 @@
</span><span class="cx">
</span><span class="cx"> if ( !empty($number) ) {
</span><span class="cx"> if ( $offset )
</span><del>- $limit = 'LIMIT ' . $offset . ',' . $number;
</del><ins>+ $limits = 'LIMIT ' . $offset . ',' . $number;
</ins><span class="cx"> else
</span><del>- $limit = 'LIMIT ' . $number;
</del><ins>+ $limits = 'LIMIT ' . $number;
</ins><span class="cx"> } else {
</span><del>- $limit = '';
</del><ins>+ $limits = '';
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- $where = "WHERE $approved";
</del><ins>+ if ( $count )
+ $fields = 'COUNT(*)';
+ else
+ $fields = '*';
</ins><span class="cx">
</span><ins>+ $join = '';
+ $where = $approved;
+
</ins><span class="cx"> if ( ! empty($post_id) )
</span><span class="cx"> $where .= $wpdb->prepare( ' AND comment_post_ID = %d', $post_id );
</span><span class="cx"> if ( '' !== $author_email )
</span><span class="lines">@@ -318,15 +324,17 @@
</span><span class="cx"> if ( '' !== $search )
</span><span class="cx"> $where .= $this->get_search_sql( $search, array( 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_author_IP', 'comment_content' ) );
</span><span class="cx">
</span><del>- $pieces = array( 'where', 'orderby', 'order', 'limit' );
</del><ins>+ $pieces = array( 'fields', 'join', 'where', 'orderby', 'order', 'limits' );
</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><ins>+ $query = "SELECT $fields FROM $wpdb->comments $join WHERE $where ORDER BY $orderby $order $limits";
+
</ins><span class="cx"> if ( $count )
</span><del>- return $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->comments $where ORDER BY $orderby $order $limit" );
</del><ins>+ return $wpdb->get_var( $query );
</ins><span class="cx">
</span><del>- $comments = $wpdb->get_results( "SELECT * FROM $wpdb->comments $where ORDER BY $orderby $order $limit" );
</del><ins>+ $comments = $wpdb->get_results( $query );
</ins><span class="cx"> $comments = apply_filters_ref_array( 'the_comments', array( $comments, &$this ) );
</span><span class="cx">
</span><span class="cx"> wp_cache_add( $cache_key, $comments, 'comment' );
</span></span></pre>
</div>
</div>
</body>
</html>