<!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>[34500] trunk/src/wp-admin: Comments: update Comment counts dynamically in the Right Now widget based on moderation actions in the Activity widget.</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/34500">34500</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/34500","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-24 15:52:41 +0000 (Thu, 24 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'>Comments: update Comment counts dynamically in the Right Now widget based on moderation actions in the Activity widget.
Fixes <a href="https://core.trac.wordpress.org/ticket/10422">#10422</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesajaxactionsphp">trunk/src/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunksrcwpadminincludesdashboardphp">trunk/src/wp-admin/includes/dashboard.php</a></li>
<li><a href="#trunksrcwpadminjseditcommentsjs">trunk/src/wp-admin/js/edit-comments.js</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-24 14:53:46 UTC (rev 34499)
+++ trunk/src/wp-admin/includes/ajax-actions.php 2015-09-24 15:52:41 UTC (rev 34500)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -351,6 +351,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $time = time();
</span><span class="cx" style="display: block; padding: 0 10px"> $comment = get_comment( $comment_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $counts = wp_count_comments();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $x = new WP_Ajax_Response( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'what' => 'comment',
</span><span class="cx" style="display: block; padding: 0 10px"> // Here for completeness - not used.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -358,7 +360,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'supplemental' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'status' => $comment ? $comment->comment_approved : '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'postId' => $comment ? $comment->comment_post_ID : '',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'time' => $time
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'time' => $time,
+ 'in_moderation' => $counts->moderated,
+ 'i18n_comments_text' => sprintf(
+ _n( '%s Comment', '%s Comments', $counts->approved ),
+ number_format_i18n( $counts->approved )
+ ),
+ 'i18n_moderation_text' => sprintf(
+ _nx( '%s in moderation', '%s in moderation', $counts->moderated, 'comments' ),
+ number_format_i18n( $counts->moderated )
+ )
</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"> $x->send();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1049,9 +1060,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'position' => $position
</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">- if ( $comment_auto_approved )
- $response['supplemental'] = array( 'parent_approved' => $parent->comment_ID, 'parent_post_id' => $parent->comment_post_ID );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $counts = wp_count_comments();
+ $response['supplemental'] = array(
+ 'in_moderation' => $counts->moderated,
+ 'i18n_comments_text' => sprintf(
+ _n( '%s Comment', '%s Comments', $counts->approved ),
+ number_format_i18n( $counts->approved )
+ ),
+ 'i18n_moderation_text' => sprintf(
+ _nx( '%s in moderation', '%s in moderation', $counts->moderated, 'comments' ),
+ number_format_i18n( $counts->moderated )
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $comment_auto_approved ) {
+ $response['supplemental']['parent_approved'] = $parent->comment_ID;
+ $response['supplemental']['parent_post_id'] = $parent->comment_post_ID;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $x = new WP_Ajax_Response();
</span><span class="cx" style="display: block; padding: 0 10px"> $x->add( $response );
</span><span class="cx" style="display: block; padding: 0 10px"> $x->send();
</span></span></pre></div>
<a id="trunksrcwpadminincludesdashboardphp"></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/dashboard.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/dashboard.php 2015-09-24 14:53:46 UTC (rev 34499)
+++ trunk/src/wp-admin/includes/dashboard.php 2015-09-24 15:52:41 UTC (rev 34500)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -259,13 +259,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <li class="comment-count"><a href="edit-comments.php"><?php echo $text; ?></a></li>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $num_comm->moderated ) {
- /* translators: Number of comments in moderation */
- $text = sprintf( _nx( '%s in moderation', '%s in moderation', $num_comm->moderated, 'comments' ), number_format_i18n( $num_comm->moderated ) );
- ?>
- <li class="comment-mod-count"><a href="edit-comments.php?comment_status=moderated"><?php echo $text; ?></a></li>
- <?php
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Number of comments in moderation */
+ $text = sprintf( _nx( '%s in moderation', '%s in moderation', $num_comm->moderated, 'comments' ), number_format_i18n( $num_comm->moderated ) );
+ ?>
+ <li class="comment-mod-count<?php
+ if ( ! $num_comm->moderated ) {
+ echo ' hidden';
+ }
+ ?>"><a href="edit-comments.php?comment_status=moderated"><?php echo $text; ?></a></li>
+ <?php
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -554,7 +556,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool $show_date
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $GLOBALS['comment'] =& $comment;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $GLOBALS['comment'] = clone $comment;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $comment->comment_post_ID > 0 && current_user_can( 'edit_post', $comment->comment_post_ID ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_post_title = _draft_or_post_title( $comment->comment_post_ID );
</span></span></pre></div>
<a id="trunksrcwpadminjseditcommentsjs"></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/js/edit-comments.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/edit-comments.js 2015-09-24 14:53:46 UTC (rev 34499)
+++ trunk/src/wp-admin/js/edit-comments.js 2015-09-24 15:52:41 UTC (rev 34500)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3,7 +3,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> (function($) {
</span><span class="cx" style="display: block; padding: 0 10px"> var getCount, updateCount, updateCountText, updatePending, updateApproved,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- updateHtmlTitle, adminTitle = document.title;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ updateHtmlTitle, updateDashboardText, adminTitle = document.title;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> setCommentsList = function() {
</span><span class="cx" style="display: block; padding: 0 10px"> var totalInput, perPageInput, pageInput, dimAfter, delBefore, updateTotalCount, delAfter, refillTheExtraList, diff,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,6 +19,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> var editRow, replyID, replyButton, response,
</span><span class="cx" style="display: block; padding: 0 10px"> c = $( '#' + settings.element );
</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 ( true !== settings.parsed ) {
+ response = settings.parsed.responses[0];
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> editRow = $('#replyrow');
</span><span class="cx" style="display: block; padding: 0 10px"> replyID = $('#comment_ID', editRow).val();
</span><span class="cx" style="display: block; padding: 0 10px"> replyButton = $('#replybtn', editRow);
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,10 +40,10 @@
</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"> diff = $('#' + settings.element).is('.' + settings.dimClass) ? 1 : -1;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( true !== settings.parsed && settings.parsed.responses.length ) {
- response = settings.parsed.responses[0].supplemental;
- updatePending( diff, response.postId );
- updateApproved( -1 * diff, response.postId );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( response ) {
+ updateDashboardText( response.supplemental );
+ updatePending( diff, response.supplemental.postId );
+ updateApproved( -1 * diff, response.supplemental.postId );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> updatePending( diff );
</span><span class="cx" style="display: block; padding: 0 10px"> updateApproved( -1 * diff );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -277,12 +281,26 @@
</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">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ updateDashboardText = function ( response ) {
+ if ( ! isDashboard || ! response || ! response.i18n_comments_text ) {
+ return;
+ }
+
+ var rightNow = $( '#dashboard_right_now' );
+
+ $( '.comment-count a', rightNow ).text( response.i18n_comments_text );
+ $( '.comment-mod-count a', rightNow ).text( response.i18n_moderation_text )
+ .parent()
+ [ response.in_moderation > 0 ? 'removeClass' : 'addClass' ]( 'hidden' );
+ };
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // In admin-ajax.php, we send back the unix time stamp instead of 1 on success
</span><span class="cx" style="display: block; padding: 0 10px"> delAfter = function( r, settings ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var total_items_i18n, total, animated, animatedCallback,
</span><span class="cx" style="display: block; padding: 0 10px"> response = true === settings.parsed ? {} : settings.parsed.responses[0],
</span><span class="cx" style="display: block; padding: 0 10px"> commentStatus = true === settings.parsed ? '' : response.supplemental.status,
</span><span class="cx" style="display: block; padding: 0 10px"> commentPostId = true === settings.parsed ? '' : response.supplemental.postId,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ newTotal = true === settings.parsed ? '' : response.supplemental,
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> targetParent = $( settings.target ).parent(),
</span><span class="cx" style="display: block; padding: 0 10px"> commentRow = $('#' + settings.element),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -294,6 +312,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> spammed = commentRow.hasClass( 'spam' ),
</span><span class="cx" style="display: block; padding: 0 10px"> trashed = commentRow.hasClass( 'trash' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ updateDashboardText( newTotal );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // the order of these checks is important
</span><span class="cx" style="display: block; padding: 0 10px"> // .unspam can also have .approve or .unapprove
</span><span class="cx" style="display: block; padding: 0 10px"> // .untrash can also have .approve or .unapprove
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -771,6 +791,10 @@
</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">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( r.supplemental.i18n_comments_text ) {
+ updateDashboardText( r.supplemental );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> c = $.trim(r.data); // Trim leading whitespaces
</span><span class="cx" style="display: block; padding: 0 10px"> $(c).hide();
</span><span class="cx" style="display: block; padding: 0 10px"> $('#replyrow').after(c);
</span></span></pre>
</div>
</div>
</body>
</html>