Ticket #11200: 11200.diff

wp-admin/edit-comments.php

@@ -154 +154 @@
 <?php
 $status_links = array();
 $num_comments = ( $post_id ) ? wp_count_comments( $post_id ) : wp_count_comments();
-//, number_format_i18n($num_comments->moderated) ), "<span class='comment-count'>" . number_format_i18n($num_comments->moderated) . "</span>"),
-//, number_format_i18n($num_comments->spam) ), "<span class='spam-comment-count'>" . number_format_i18n($num_comments->spam) . "</span>")
+
 $stati = array(
                 'all' => _n_noop('All', 'All'), // singular not used
+                'approved' => _n_noop('Approved <span class="count">(<span class="approved-count">%s</span>)</span>', 'Approved <span class="count">(<span class="approved-count">%s</span>)</span>'),
                 'moderated' => _n_noop('Pending <span class="count">(<span class="pending-count">%s</span>)</span>', 'Pending <span class="count">(<span class="pending-count">%s</span>)</span>'),
-                'approved' => _n_noop('Approved', 'Approved'), // singular not used
                 'spam' => _n_noop('Spam <span class="count">(<span class="spam-count">%s</span>)</span>', 'Spam <span class="count">(<span class="spam-count">%s</span>)</span>'),
                 'trash' => _n_noop('Trash <span class="count">(<span class="trash-count">%s</span>)</span>', 'Trash <span class="count">(<span class="trash-count">%s</span>)</span>')
         );

wp-admin/js/edit-comments.dev.js

@@ -141 +141 @@
 
         // In admin-ajax.php, we send back the unix time stamp instead of 1 on success
         delAfter = function( r, settings ) {
-                var total, pageLinks, N, untrash = $(settings.target).parent().is('span.untrash'), spam, trash;
+                var total, appr, pageLinks, N, spam, trash, untrash, unapproved;
 
                 function getUpdate(s) {
                         if ( $(settings.target).parent().is('span.' + s) )
                                 return 1;
-                        else if ( $('#' + settings.element).is('.' + s) )
+                        
+                        if ( $('#' + settings.element).is('.' + s) )
                                 return -1;
 
                         return 0;
                 }
+
+                appr = $('span.approved-count');
+                apprN = getCount(appr);
                 spam = getUpdate('spam');
                 trash = getUpdate('trash');
+                untrash = $(settings.target).parent().is('span.untrash');
+                unapproved = $('#' + settings.element).is('.unapproved');
 
                 if ( untrash )
                         trash = -1;
 
                 $('span.pending-count').each( function() {
-                        var a = $(this), n = getCount(a), unapproved = $('#' + settings.element).is('.unapproved');
+                        var a = $(this), n = getCount(a);
 
                         if ( $(settings.target).parent().is('span.unapprove') || ( untrash && unapproved ) ) { // we "deleted" an approved comment from the approved list by clicking "Unapprove"
                                 n = n + 1;
+                                updateCount(appr, apprN-1);
                         } else if ( unapproved ) { // we deleted a formerly unapproved comment
                                 n = n - 1;
+                                updateCount(appr, apprN+1);
                         }
                         if ( n < 0 ) { n = 0; }
                         a.closest('#awaiting-mod')[ 0 == n ? 'addClass' : 'removeClass' ]('count-0');