Ticket #33414: 33414.2.diff

src/wp-admin/admin-header.php

@@ -75 +75 @@
         pagenow = '<?php echo $current_screen->id; ?>',
         typenow = '<?php echo $current_screen->post_type; ?>',
         adminpage = '<?php echo $admin_body_class; ?>',
+        adminTitle = '<?php echo esc_js( html_entity_decode( $admin_title ) ) ?>',
         thousandsSeparator = '<?php echo addslashes( $wp_locale->number_format['thousands_sep'] ); ?>',
         decimalPoint = '<?php echo addslashes( $wp_locale->number_format['decimal_point'] ); ?>',
         isRtl = <?php echo (int) is_rtl(); ?>;

src/wp-admin/edit-comments.php

@@ -104 +104 @@
 wp_enqueue_script('admin-comments');
 enqueue_comment_hotkeys_js();
 
-if ( $post_id )
-        $title = sprintf( __( 'Comments on “%s”' ), wp_html_excerpt( _draft_or_post_title( $post_id ), 50, '…' ) );
-else
-        $title = __('Comments');
+if ( $post_id ) {
+        $comments_count = get_comment_count( $post_id );
+        $draft_or_post_title = wp_html_excerpt( _draft_or_post_title( $post_id ), 50, '…' );
+        if ( $comments_count['awaiting_moderation'] > 0 ) {
+                $title = sprintf(
+                        __( 'Comments (%s) on “%s”' ),
+                        number_format_i18n( $comments_count['awaiting_moderation'] ),
+                        $draft_or_post_title
+                );
+        } else {
+                $title = sprintf( __( 'Comments on “%s”' ), $draft_or_post_title );
+        }
+} else {
+        $comments_count = get_comment_count();
+        if ( $comments_count['awaiting_moderation'] > 0 ) {
+                $title = sprintf(
+                        __( 'Comments (%s)' ),
+                        number_format_i18n( $comments_count['awaiting_moderation'] )
+                );
+        } else {
+                $title = __( 'Comments' );
+        }
+}
 
 add_screen_option( 'per_page' );
 

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

@@ -1 @@
-/* global adminCommentsL10n, thousandsSeparator, list_args, QTags, ajaxurl, wpAjax */
+/* global adminTitle, adminCommentsL10n, thousandsSeparator, list_args, QTags, ajaxurl, wpAjax */
 var setCommentsList, theList, theExtraList, commentReply;
 
 (function($) {
-var getCount, updateCount, updateCountText, updatePending, updateApproved;
+var getCount, updateCount, updateCountText, updatePending, updateApproved, updateHtmlTitle;
 
 setCommentsList = function() {
         var totalInput, perPageInput, pageInput, dimAfter, delBefore, updateTotalCount, delAfter, refillTheExtraList, diff,
-                lastConfidentTime = 0;
+                lastConfidentTime = 0, titleDiv, titleRegEx;
 
         totalInput = $('input[name="_total"]', '#comments-form');
         perPageInput = $('input[name="_per_page"]', '#comments-form');
@@ -135 +135 @@
                 el.html(n);
         };
 
+        updateHtmlTitle = function ( diff ) {
+                var newTitle, regexMatch, titleCount;
+
+                titleRegEx = titleRegEx || new RegExp( 'Comments (\\([0-9' + thousandsSeparator + ']+\\))?' );
+                titleDiv = titleDiv || $( '<div />' );
+
+                titleDiv.html( document.title );
+                titleCount = getCount( titleDiv ) + diff;
+                if ( titleCount >= 1 ) {
+                        updateCount( titleDiv, titleCount );
+                        regexMatch = titleRegEx.exec( document.title );
+                        if ( regexMatch ) {
+                                newTitle = document.title.replace( regexMatch[0], 'Comments (' + titleDiv.text() + ') ' );
+                        }
+                } else {
+                        newTitle = adminTitle;
+                        regexMatch = titleRegEx.exec( newTitle );
+                        if ( regexMatch ) {
+                                newTitle = newTitle.replace( regexMatch[0], 'Comments' );
+                        }
+                }
+                document.title = newTitle;
+        };
+
         updatePending = function( diff, commentPostId ) {
                 var postSelector = '.post-com-count-' + commentPostId,
                         noClass = 'comment-count-no-pending',
@@ -143 +167 @@
                         pending,
                         noPending;
 
+                updateHtmlTitle( diff );
+
                 $( 'span.pending-count' ).each(function() {
                         var a = $(this), n = getCount(a) + diff;
                         if ( n < 1 )

src/wp-includes/comment-functions.php

@@ -366 +366 @@
                 "approved"              => 0,
                 "awaiting_moderation"   => 0,
                 "spam"                  => 0,
+                "trash"                 => 0,
                 "total_comments"        => 0
         );
 
@@ -375 +376 @@
                                 $comment_count['spam'] = $row['total'];
                                 $comment_count["total_comments"] += $row['total'];
                                 break;
+                        case 'trash':
+                                $comment_count['trash'] = $row['total'];
+                                break;
                         case 1:
                                 $comment_count['approved'] = $row['total'];
                                 $comment_count['total_comments'] += $row['total'];