<!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>[34161] trunk: In `_wp_ajax_delete_comment_response()`, read the new `'all'` prop returned by `get_comment_count()` via `wp_count_comments()` when setting `$total`.</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/34161">34161</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/34161","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 01:46:51 +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'>In `_wp_ajax_delete_comment_response()`, read the new `'all'` prop returned by `get_comment_count()` via `wp_count_comments()` when setting `$total`. `'all'` doesn't include `spam` in its count.
Updates unit tests.
Props dipesh.kakadiya.
Fixes <a href="https://core.trac.wordpress.org/ticket/32362">#32362</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesajaxactionsphp">trunk/src/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunksrcwpincludescommentfunctionsphp">trunk/src/wp-includes/comment-functions.php</a></li>
<li><a href="#trunktestsphpunittestscommentwpCountCommentsphp">trunk/tests/phpunit/tests/comment/wpCountComments.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesajaxactionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/ajax-actions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/ajax-actions.php 2015-09-15 01:33:29 UTC (rev 34160)
+++ trunk/src/wp-admin/includes/ajax-actions.php 2015-09-15 01:46:51 UTC (rev 34161)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -371,7 +371,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Only do the expensive stuff on a page-break, and about 1 other time per page
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 0 == $total % $per_page || 1 == mt_rand( 1, $per_page ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = 0;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $status = 'total_comments'; // What type of comment count are we looking for?
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // What type of comment count are we looking for?
+ $status = 'all';
</ins><span class="cx" style="display: block; padding: 0 10px"> $parsed = parse_url( $url );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $parsed['query'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> parse_str( $parsed['query'], $query_vars );
</span></span></pre></div>
<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-09-15 01:33:29 UTC (rev 34160)
+++ trunk/src/wp-includes/comment-functions.php 2015-09-15 01:46:51 UTC (rev 34161)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -362,6 +362,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'trash' => 0,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post-trashed' => 0,
</span><span class="cx" style="display: block; padding: 0 10px"> 'total_comments' => 0,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'all' => 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="lines" style="display: block; padding: 0 10px; color: #888">@@ -379,10 +380,12 @@
</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="cx" style="display: block; padding: 0 10px"> $comment_count['total_comments'] += $row['total'];
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_count['all'] += $row['total'];
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case '0':
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_count['awaiting_moderation'] = $row['total'];
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_count['total_comments'] += $row['total'];
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_count['all'] += $row['total'];
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> default:
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span></span></pre></div>
<a id="trunktestsphpunittestscommentwpCountCommentsphp"></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/wpCountComments.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment/wpCountComments.php 2015-09-15 01:33:29 UTC (rev 34160)
+++ trunk/tests/phpunit/tests/comment/wpCountComments.php 2015-09-15 01:46:51 UTC (rev 34161)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,6 +11,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, $count->trash );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, $count->{'post-trashed'} );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, $count->total_comments );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 0, $count->all );
</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"> public function test_wp_count_comments_approved() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,6 +27,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, $count->trash );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, $count->{'post-trashed'} );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, $count->total_comments );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 1, $count->all );
</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"> public function test_wp_count_comments_awaiting() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,6 +43,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, $count->trash );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, $count->{'post-trashed'} );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, $count->total_comments );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 1, $count->all );
</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"> public function test_wp_count_comments_spam() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,6 +59,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, $count->trash );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, $count->{'post-trashed'} );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, $count->total_comments );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 0, $count->all );
</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"> public function test_wp_count_comments_trash() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,6 +75,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, $count->trash );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, $count->{'post-trashed'} );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, $count->total_comments );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 0, $count->all );
</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"> public function test_wp_count_comments_post_trashed() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -86,6 +91,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, $count->trash );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, $count->{'post-trashed'} );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, $count->total_comments );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 0, $count->all );
</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"> public function test_wp_count_comments_cache() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -105,6 +111,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, $count1->trash );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, $count1->{'post-trashed'} );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, $count1->total_comments );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 1, $count1->all );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $all_count1 = wp_count_comments();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -114,6 +121,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, $all_count1->trash );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, $all_count1->{'post-trashed'} );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, $all_count1->total_comments );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 1, $all_count1->all );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_spam_comment( $comment_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -125,6 +133,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, $count2->trash );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, $count2->{'post-trashed'} );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, $count2->total_comments );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 0, $count2->all );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $all_count2 = wp_count_comments();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -134,6 +143,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, $all_count2->trash );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, $all_count2->{'post-trashed'} );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, $all_count2->total_comments );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 0, $all_count2->all );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_trash_comment( $comment_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -145,6 +155,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, $count3->trash );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, $count3->{'post-trashed'} );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, $count3->total_comments );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 0, $count3->all );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $all_count3 = wp_count_comments();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -154,6 +165,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, $all_count3->trash );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, $all_count3->{'post-trashed'} );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, $all_count3->total_comments );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 0, $all_count3->all );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_untrash_comment( $comment_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -165,6 +177,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, $count4->trash );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, $count4->{'post-trashed'} );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, $count4->total_comments );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 0, $count4->all );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $all_count4 = wp_count_comments();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -174,5 +187,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, $all_count4->trash );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, $all_count4->{'post-trashed'} );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, $all_count4->total_comments );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 0, $all_count4->all );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>