Ticket #6530: garyc40-6530.patch

wp-admin/admin-ajax.php

@@ -184 +184 @@
  * @since 2.7
  *
  * @param int $comment_id
+ * @param int $delta How many units should the total post count be increased (or decreased).
  * @return die
  */
-function _wp_ajax_delete_comment_response( $comment_id ) {
+function _wp_ajax_delete_comment_response( $comment_id, $delta = -1 ) {
         $total = (int) @$_POST['_total'];
         $per_page = (int) @$_POST['_per_page'];
         $page = (int) @$_POST['_page'];
@@ -195 +196 @@
         if ( !$total || !$per_page || !$page || !$url )
                 die( (string) time() );
 
-        if ( --$total < 0 ) // Take the total from POST and decrement it (since we just deleted one)
+        $total += $delta;
+        if ( $total < 0 )
                 $total = 0;
 
-        if ( 0 != $total % $per_page && 1 != mt_rand( 1, $per_page ) ) // Only do the expensive stuff on a page-break, and about 1 other time per page
-                die( (string) time() );
-
-        $post_id = 0;
-        $status = 'total_comments'; // What type of comment count are we looking for?
-        $parsed = parse_url( $url );
-        if ( isset( $parsed['query'] ) ) {
-                parse_str( $parsed['query'], $query_vars );
-                if ( !empty( $query_vars['comment_status'] ) )
-                        $status = $query_vars['comment_status'];
-                if ( !empty( $query_vars['p'] ) )
-                        $post_id = (int) $query_vars['p'];
-        }
-
-        $comment_count = wp_count_comments($post_id);
-        $time = time(); // The time since the last comment count
-
-        if ( isset( $comment_count->$status ) ) // We're looking for a known type of comment count
-                $total = $comment_count->$status;
-        // else use the decremented value from above
-
-        $page_links = paginate_links( array(
-                'base' => add_query_arg( 'apage', '%#%', $url ),
-                'format' => '',
-                'prev_text' => __('&laquo;'),
-                'next_text' => __('&raquo;'),
-                'total' => ceil($total / $per_page),
-                'current' => $page
-        ) );
-        $x = new WP_Ajax_Response( array(
+        $response = array(
                 'what' => 'comment',
                 'id' => $comment_id, // here for completeness - not used
                 'supplemental' => array(
-                        'pageLinks' => $page_links,
-                        'total' => $total,
-                        'time' => $time
+                        'time' => time(),
+                        'l10nTotal' => sprintf( _n( '1 item', '%s items', $total ), number_format_i18n( $total ) ),
                 )
-        ) );
+        );
+
+        if ( 0 == $total % $per_page || 1 == mt_rand( 1, $per_page ) ) { // Only do the expensive stuff on a page-break, and about 1 other time per page
+
+                $post_id = 0;
+                $status = 'total_comments'; // What type of comment count are we looking for?
+                $parsed = parse_url( $url );
+                if ( isset( $parsed['query'] ) ) {
+                        parse_str( $parsed['query'], $query_vars );
+                        if ( !empty( $query_vars['comment_status'] ) )
+                                $status = $query_vars['comment_status'];
+                        if ( !empty( $query_vars['p'] ) )
+                                $post_id = (int) $query_vars['p'];
+                }
+
+                $comment_count = wp_count_comments($post_id);
+
+                if ( isset( $comment_count->$status ) ) // We're looking for a known type of comment count
+                        $total = $comment_count->$status;
+                // else use the decremented value from above
+        
+                set_current_screen( 'edit-comments' );
+                $_REQUEST['paged'] = $page;
+                $wp_list_table = get_list_table( 'WP_Comments_List_Table' );
+                $wp_list_table->set_pagination_args( array(
+                        'total_items' => $total,
+                        'per_page' => $per_page,
+                ) );
+        
+                ob_start();
+                $wp_list_table->pagination();
+                $page_links = ob_get_clean();
+                $response['supplemental']['pageLinks'] = $page_links;
+        }
+        
+        $response['supplemental']['total'] = $total;
+        
+        $x = new WP_Ajax_Response( $response );
         $x->send();
 }
 
@@ -327 +336 @@
 
         check_ajax_referer( "delete-comment_$id" );
         $status = wp_get_comment_status( $comment->comment_ID );
-
+        $delta = -1;
         if ( isset($_POST['trash']) && 1 == $_POST['trash'] ) {
                 if ( 'trash' == $status )
                         die( (string) time() );
@@ -336 +345 @@
                 if ( 'trash' != $status )
                         die( (string) time() );
                 $r = wp_untrash_comment( $comment->comment_ID );
+                if ( $_POST['comment_status'] != 'trash' ) {
+                        $delta = 1;
+                }
         } elseif ( isset($_POST['spam']) && 1 == $_POST['spam'] ) {
                 if ( 'spam' == $status )
                         die( (string) time() );
@@ -344 +356 @@
                 if ( 'spam' != $status )
                         die( (string) time() );
                 $r = wp_unspam_comment( $comment->comment_ID );
+                if ( $_POST['comment_status'] != 'spam' ) {
+                        $delta = 1;
+                }
         } elseif ( isset($_POST['delete']) && 1 == $_POST['delete'] ) {
                 $r = wp_delete_comment( $comment->comment_ID );
         } else {
@@ -351 +366 @@
         }
 
         if ( $r ) // Decide if we need to send back '1' or a more complicated response including page links and comment counts
-                _wp_ajax_delete_comment_response( $comment->comment_ID );
+                _wp_ajax_delete_comment_response( $comment->comment_ID, $delta );
         die( '0' );
         break;
 case 'delete-tag' :

wp-admin/edit-comments.php

@@ -228 +228 @@
 <input type="hidden" name="comment_status" value="<?php echo esc_attr($comment_status); ?>" />
 <input type="hidden" name="pagegen_timestamp" value="<?php echo esc_attr(current_time('mysql', 1)); ?>" />
 
-<input type="hidden" name="_total" value="<?php echo esc_attr( $wp_list_table->get_pagination_arg('total_items') ); ?>" />
-<input type="hidden" name="_per_page" value="<?php echo esc_attr( $wp_list_table->get_pagination_arg('per_page') ); ?>" />
-<input type="hidden" name="_page" value="<?php echo esc_attr( $wp_list_table->get_pagination_arg('page') ); ?>" />
+<input type="hidden" autocomplete="off" name="_total" value="<?php echo esc_attr( $wp_list_table->get_pagination_arg('total_items') ); ?>" />
+<input type="hidden" autocomplete="off" name="_per_page" value="<?php echo esc_attr( $wp_list_table->get_pagination_arg('per_page') ); ?>" />
+<input type="hidden" autocomplete="off" name="_page" value="<?php echo esc_attr( $wp_list_table->get_pagination_arg('page') ); ?>" />
 
 <?php if ( isset($_REQUEST['paged']) ) { ?>
         <input type="hidden" name="paged" value="<?php echo esc_attr( absint( $_REQUEST['paged'] ) ); ?>" />

wp-admin/includes/class-wp-list-table.php

@@ -478 +478 @@
                 $output = '<span class="displaying-num">' . sprintf( _n( '1 item', '%s items', $total_items ), number_format_i18n( $total_items ) ) . '</span>';
 
                 $current = $this->get_pagenum();
-
-                $current_url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
+                
+                if (! defined( 'DOING_AJAX' ) || ! DOING_AJAX ) {
+                        $current_url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
+                } else {
+                        $current_url = wp_get_referer();
+                }
 
                 $page_links = array();
 

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

@@ -4 +4 @@
 setCommentsList = function() {
         var totalInput, perPageInput, pageInput, lastConfidentTime = 0, dimAfter, delBefore, updateTotalCount, delAfter;
 
-        totalInput = $('.tablenav input[name="_total"]', '#comments-form');
-        perPageInput = $('.tablenav input[name="_per_page"]', '#comments-form');
-        pageInput = $('.tablenav input[name="_page"]', '#comments-form');
+        totalInput = $('input[name="_total"]', '#comments-form');
+        perPageInput = $('input[name="_per_page"]', '#comments-form');
+        pageInput = $('input[name="_page"]', '#comments-form');
 
         dimAfter = function( r, settings ) {
                 var c = $('#' + settings.element);
@@ -38 +38 @@
                 settings.data._per_page = perPageInput.val() || 0;
                 settings.data._page = pageInput.val() || 0;
                 settings.data._url = document.location.href;
+                settings.data.comment_status = $('input[name=comment_status]', '#comments-form').val();
 
                 if ( cl.indexOf(':trash=1') != -1 )
                         action = 'trash';
@@ -85 +86 @@
         };
 
         // Updates the current total (as displayed visibly)
-        updateTotalCount = function( total, time, setConfidentTime ) {
+        updateTotalCount = function( total, time, setConfidentTime, l10nTotal ) {
+                var per_page, total_pages;
                 if ( time < lastConfidentTime )
                         return;
 
@@ -93 +95 @@
                         lastConfidentTime = time;
 
                 totalInput.val( total.toString() );
-                $('span.total-type-count').each( function() {
-                        updateCount( $(this), total );
-                });
+                $('.tablenav-pages .displaying-num').text(l10nTotal);
+
+                total_pages = Math.ceil(total/perPageInput.val());
+                if (pageInput.val() > total_pages) {
+                        listTable.change_page(total_pages);
+                }
         };
 
         function dashboardTotals(n) {
@@ -135 +140 @@
                         }
                         n = n + n1;
                 }
+
                 el.html(n);
         }
 
@@ -185 +191 @@
                 if ( $('#dashboard_right_now').length ) {
                         N = trash ? -1 * trash : 0;
                         dashboardTotals(N);
-                } else {
-                        total = totalInput.val() ? parseInt( totalInput.val(), 10 ) : 0;
-                        total = total - spam - trash;
-                        if ( total < 0 )
-                                total = 0;
-
-                        if ( ( 'object' == typeof r ) && lastConfidentTime < settings.parsed.responses[0].supplemental.time ) {
-                                pageLinks = settings.parsed.responses[0].supplemental.pageLinks || '';
-                                if ( $.trim( pageLinks ) )
-                                        $('.tablenav-pages').find( '.page-numbers' ).remove().end().append( $( pageLinks ) );
-                                else
-                                        $('.tablenav-pages').find( '.page-numbers' ).remove();
-
-                                updateTotalCount( total, settings.parsed.responses[0].supplemental.time, true );
-                        } else {
-                                updateTotalCount( total, r, false );
+                } else if ( ( 'object' == typeof r ) && lastConfidentTime < settings.parsed.responses[0].supplemental.time ) {
+                        parsedResponse = settings.parsed.responses[0]
+                        pageLinks = parsedResponse.supplemental.pageLinks || '';
+                        if ( $.trim( pageLinks ) ) {
+                                $('.tablenav-pages').each(function(){
+                                        $(this).replaceWith($(pageLinks));
+                                });
                         }
+
+                        updateTotalCount( parsedResponse.supplemental.total, parsedResponse.supplemental.time, true, parsedResponse.supplemental.l10nTotal );
                 }
 
 
@@ -246 +245 @@
                         if ( s.target.className.indexOf(':trash=1') != -1 || s.target.className.indexOf(':spam=1') != -1 )
                                 $('#undo-' + id).fadeIn(300, function(){ $(this).show() });
                 });
-        $(listTable).bind('changePage', refillTheExtraList);
+        $(listTable).bind('changePage', function(paged){
+                pageInput.val(paged);
+                refillTheExtraList(true);
+        });
 };
 
 commentReply = {

wp-admin/js/list-table.dev.js

@@ -133 +133 @@
                 this.loading = false;
 
                 $('.list-ajax-loading').css('visibility', 'hidden');
-        }
-}
-
-listTable.init();
-
-// Ajaxify various UI elements
-
-        function change_page(paged, $el) {
+        },
+        
+        change_page: function(paged, $el) {
                 if ( paged < 1 )
                         paged = 1;
 
-                if ( paged > listTable.get_total_pages() )
-                        paged = listTable.get_total_pages();
+                if ( paged > this.get_total_pages() )
+                        paged = this.get_total_pages();
 
-                $(listTable).trigger('beforeChangePage');
-                listTable.update_rows({'paged': paged}, false, function() {
+                $(this).trigger('beforeChangePage');
+                this.update_rows({'paged': paged}, false, function() {
                         if ( $el.parents('.tablenav.bottom').length )
                                 scrollTo(0, 0);
                                 
-                        $(listTable).trigger('changePage');
+                        $(this).trigger('changePage', [paged]);
                 });
         }
+}
+
+listTable.init();
+
+// Ajaxify various UI elements
 
         // pagination
-        $('.tablenav-pages a').click(function() {
+        $('.tablenav-pages a').live('click', function() {
                 var $el = $(this),
                         paged = $.query.GET('paged');
 
@@ -176 +176 @@
                                 break;
                 }
 
-                change_page(paged, $el);
+                listTable.change_page(paged, $el);
 
                 return false;
         });
@@ -187 +187 @@
 
                 var $el = $(this);
 
-                change_page(parseInt($el.val()) || 1, $el);
+                listTable.change_page(parseInt($el.val()) || 1, $el);
 
                 return false;
         });