Changeset 15630 for trunk/wp-admin/admin-ajax.php

Timestamp:

09/18/2010 05:46:29 PM (16 years ago)

Author:

scribu

Message:

WP_Comments_Table cleanup:

• use column_*() methods
• remove extra arguments from single_row()
• introduce derived class WP_Post_Comments_Table for handling the post metabox comments
• use $pending_count property instead of $_comment_pending_count global

See #14579

File:

• trunk/wp-admin/admin-ajax.php (modified) (8 diffs)

trunk/wp-admin/admin-ajax.php

@@ -625 +625 @@
 
         $wp_list_table = get_list_table('comments');
+        $wp_list_table->from_ajax = true;
+
         $wp_list_table->prepare_items();
 
@@ -632 +634 @@
         $x = new WP_Ajax_Response();
         foreach ( $wp_list_table->items as $comment ) {
-                get_comment( $comment );
                 ob_start();
-                        $wp_list_table->single_row( $comment->comment_ID, $mode, $comment_status, true, true );
+                        $wp_list_table->single_row( $comment );
                         $comment_list_item = ob_get_contents();
                 ob_end_clean();
@@ -652 +653 @@
                 die('-1');
 
-        $wp_list_table = get_list_table('comments');
+        $wp_list_table = get_list_table('post-comments');
+
         $wp_list_table->prepare_items();
 
@@ -663 +665 @@
                 get_comment( $comment );
                 ob_start();
-                        $wp_list_table->single_row( $comment->comment_ID, 'single', false, false );
+                        $wp_list_table->single_row( $comment );
                         $comment_list_item .= ob_get_contents();
                 ob_end_clean();
@@ -677 +679 @@
 
         $wp_list_table = get_list_table('comments');
+        $wp_list_table->checkbox = ( isset($_POST['checkbox']) && true == $_POST['checkbox'] ) ? 1 : 0;
 
         $comment_post_ID = (int) $_POST['comment_post_ID'];
@@ -716 +719 @@
 
         $position = ( isset($_POST['position']) && (int) $_POST['position']) ? (int) $_POST['position'] : '-1';
-        $checkbox = ( isset($_POST['checkbox']) && true == $_POST['checkbox'] ) ? 1 : 0;
 
         $x = new WP_Ajax_Response();
@@ -723 +725 @@
                 if ( 'dashboard' == $mode ) {
                         require_once( ABSPATH . 'wp-admin/includes/dashboard.php' );
-                        _wp_dashboard_recent_comments_row( $comment, false );
+                        _wp_dashboard_recent_comments_row( $comment );
                 } else {
-                        $wp_list_table->single_row( $comment->comment_ID, $mode, false, $checkbox );
+                        $wp_list_table->single_row( $comment );
                 }
                 $comment_list_item = ob_get_contents();
@@ -754 +756 @@
 
         $position = ( isset($_POST['position']) && (int) $_POST['position']) ? (int) $_POST['position'] : '-1';
+        $comments_status = isset($_POST['comments_listing']) ? $_POST['comments_listing'] : '';
+
         $checkbox = ( isset($_POST['checkbox']) && true == $_POST['checkbox'] ) ? 1 : 0;
-        $comments_listing = isset($_POST['comments_listing']) ? $_POST['comments_listing'] : '';
-
-        $wp_list_table = get_list_table('comments');
+        $wp_list_table = get_list_table( $checkbox ? 'comments' : 'post-comments' );
 
         ob_start();
-                $wp_list_table->single_row( $comment_id, $mode, $comments_listing, $checkbox );
+                $wp_list_table->single_row( get_comment( $comment_id ) );
                 $comment_list_item = ob_get_contents();
         ob_end_clean();