<!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>[33822] trunk: Comments: `wp_count_comments()` can use `get_comment_count()` internally to makes its DB query, provided that `get_comment_count()` returns more properties.</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/33822">33822</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/33822","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-08-31 18:50:12 +0000 (Mon, 31 Aug 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'>Comments: `wp_count_comments()` can use `get_comment_count()` internally to makes its DB query, provided that `get_comment_count()` returns more properties.
Adds/updates unit tests. There were zero (0) unit tests for `wp_count_comments()`.
Fixes <a href="https://core.trac.wordpress.org/ticket/19903">#19903</a>. </pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludescommentfunctionsphp">trunk/src/wp-includes/comment-functions.php</a></li>
<li><a href="#trunktestsphpunittestscommentgetCommentCountphp">trunk/tests/phpunit/tests/comment/getCommentCount.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludescommentfunctionsphp"></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-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/comment-functions.php 2015-08-31 17:57:32 UTC (rev 33821)
+++ trunk/src/wp-includes/comment-functions.php 2015-08-31 18:50:12 UTC (rev 33822)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -363,17 +363,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ", ARRAY_A);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_count = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "approved" => 0,
- "awaiting_moderation" => 0,
- "spam" => 0,
- "total_comments" => 0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'approved' => 0,
+ 'awaiting_moderation' => 0,
+ 'spam' => 0,
+ 'trash' => 0,
+ 'post-trashed' => 0,
+ 'total_comments' => 0,
</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"> foreach ( $totals as $row ) {
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $row['comment_approved'] ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ case 'trash':
+ $comment_count['trash'] = $row['total'];
+ break;
+ case 'post-trashed':
+ $comment_count['post-trashed'] = $row['total'];
+ break;
</ins><span class="cx" style="display: block; padding: 0 10px"> case 'spam':
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_count['spam'] = $row['total'];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_count["total_comments"] += $row['total'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_count['total_comments'] += $row['total'];
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case '1':
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_count['approved'] = $row['total'];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -921,14 +929,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @global wpdb $wpdb
- *
</del><span class="cx" style="display: block; padding: 0 10px"> * @param int $post_id Optional. Post ID.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return object|array Comment stats.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_count_comments( $post_id = 0 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wpdb;
-
</del><span class="cx" style="display: block; padding: 0 10px"> $post_id = (int) $post_id;
</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">@@ -939,41 +943,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $count An empty array.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $post_id The post ID.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $stats = apply_filters( 'wp_count_comments', array(), $post_id );
- if ( !empty($stats) )
- return $stats;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $filtered = apply_filters( 'wp_count_comments', array(), $post_id );
+ if ( ! empty( $filtered ) ) {
+ return $filtered;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $count = wp_cache_get("comments-{$post_id}", 'counts');
-
- if ( false !== $count )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $count = wp_cache_get( "comments-{$post_id}", 'counts' );
+ if ( false !== $count ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $count;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- $where = '';
- if ( $post_id > 0 )
- $where = $wpdb->prepare( "WHERE comment_post_ID = %d", $post_id );
-
- $count = $wpdb->get_results( "SELECT comment_approved, COUNT( * ) AS num_comments FROM {$wpdb->comments} {$where} GROUP BY comment_approved", ARRAY_A );
-
- $total = 0;
- $approved = array('0' => 'moderated', '1' => 'approved', 'spam' => 'spam', 'trash' => 'trash', 'post-trashed' => 'post-trashed');
- foreach ( (array) $count as $row ) {
- // Don't count post-trashed toward totals
- if ( 'post-trashed' != $row['comment_approved'] && 'trash' != $row['comment_approved'] )
- $total += $row['num_comments'];
- if ( isset( $approved[$row['comment_approved']] ) )
- $stats[$approved[$row['comment_approved']]] = $row['num_comments'];
</del><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">- $stats['total_comments'] = $total;
- foreach ( $approved as $key ) {
- if ( empty($stats[$key]) )
- $stats[$key] = 0;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $stats = get_comment_count( $post_id );
+ $stats['moderated'] = $stats['awaiting_moderation'];
+ unset( $stats['awaiting_moderation'] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $stats = (object) $stats;
- wp_cache_set("comments-{$post_id}", $stats, 'counts');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $stats_object = (object) $stats;
+ wp_cache_set( "comments-{$post_id}", $stats_object, 'counts' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $stats;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $stats_object;
</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></pre></div>
<a id="trunktestsphpunittestscommentgetCommentCountphp"></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/getCommentCount.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment/getCommentCount.php 2015-08-31 17:57:32 UTC (rev 33821)
+++ trunk/tests/phpunit/tests/comment/getCommentCount.php 2015-08-31 18:50:12 UTC (rev 33822)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,6 +8,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, $count['approved'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, $count['awaiting_moderation'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, $count['spam'] );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 0, $count['trash'] );
+ $this->assertEquals( 0, $count['post-trashed'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, $count['total_comments'] );
</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">@@ -21,6 +23,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, $count['approved'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, $count['awaiting_moderation'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, $count['spam'] );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 0, $count['trash'] );
+ $this->assertEquals( 0, $count['post-trashed'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, $count['total_comments'] );
</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">@@ -34,6 +38,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, $count['approved'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, $count['awaiting_moderation'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, $count['spam'] );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 0, $count['trash'] );
+ $this->assertEquals( 0, $count['post-trashed'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, $count['total_comments'] );
</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">@@ -47,6 +53,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, $count['approved'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, $count['awaiting_moderation'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, $count['spam'] );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 0, $count['trash'] );
+ $this->assertEquals( 0, $count['post-trashed'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, $count['total_comments'] );
</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">@@ -60,6 +68,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, $count['approved'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, $count['awaiting_moderation'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, $count['spam'] );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 1, $count['trash'] );
+ $this->assertEquals( 0, $count['post-trashed'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, $count['total_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">+
+ public function test_get_comment_count_post_trashed() {
+ $this->factory->comment->create( array(
+ 'comment_approved' => 'post-trashed'
+ ) );
+
+ $count = get_comment_count();
+
+ $this->assertEquals( 0, $count['approved'] );
+ $this->assertEquals( 0, $count['awaiting_moderation'] );
+ $this->assertEquals( 0, $count['spam'] );
+ $this->assertEquals( 0, $count['trash'] );
+ $this->assertEquals( 1, $count['post-trashed'] );
+ $this->assertEquals( 0, $count['total_comments'] );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>