Changeset 15509 for trunk/wp-admin/includes/default-list-tables.php

Timestamp:

08/19/2010 12:06:51 AM (15 years ago)

Author:

scribu

Message:

Use adminTable to refill #the-extra-comment-list. See #14637

File:

• trunk/wp-admin/includes/default-list-tables.php (modified) (5 diffs)

trunk/wp-admin/includes/default-list-tables.php

@@ -1965 +1965 @@
         $comments_per_page = apply_filters( 'comments_per_page', $comments_per_page, $comment_status );
 
+        if ( isset( $_POST['number'] ) )
+            $number = (int) $_POST['number'];
+        else
+            $number = $comments_per_page + min( 8, $comments_per_page ); // Grab a few extra
+
         $page = $this->get_pagenum();
 
@@ -1973 +1978 @@
             'search' => $search,
             'offset' => $start,
-            'number' => $comments_per_page + 8, // Grab a few extra
+            'number' => $number,
             'post_id' => $post_id,
             'plural' => $comment_type,
@@ -1984 +1989 @@
         update_comment_cache( $_comments );
 
-        $args['count'] = true;
-        $args['offset'] = 0;
-        $args['number'] = 0;
-        $total_comments = get_comments( $args );
+        $this->items = array_slice( $_comments, 0, $comments_per_page );
+        $this->extra_items = array_slice( $_comments, $comments_per_page );
+
+        $total_comments = get_comments( array_merge( $args, array('count' => true, 'offset' => 0, 'number' => 0) ) );
 
         $_comment_post_ids = array();
@@ -1995 +2000 @@
 
         $_comment_pending_count = get_pending_comments_num( $_comment_post_ids );
-
-        $this->items = array_slice( $_comments, 0, $comments_per_page );
-        $this->extra_items = array_slice( $_comments, $comments_per_page );
 
         $this->set_pagination_args( array(
@@ -2115 +2117 @@
     }
 
-    function display_rows( $items = array() ) {
+    function display_rows( $items = false ) {
         global $mode, $comment_status;
 
-        if ( empty( $items ) )
+        if ( false === $items )
             $items = $this->items;