Changeset 15497

Timestamp:

08/12/2010 11:58:49 PM (16 years ago)

Author:

scribu

Message:

Fix Comments meta box in post editing screen. See #14579

Location:

trunk/wp-admin

Files:

• admin-ajax.php (modified) (3 diffs)
• includes/default-list-tables.php (modified) (1 diff)
• includes/meta-boxes.php (modified) (1 diff)

trunk/wp-admin/admin-ajax.php

@@ -628 +628 @@
         require_once( './includes/default-list-tables.php' );
         $table = new WP_Comments_Table();
-
-        global $comments;
-
-        if ( !$comments )
+        $table->prepare_items();
+
+        if ( !$table->has_items() )
                 die('1');
 
@@ -638 +637 @@
 
         $x = new WP_Ajax_Response();
-        foreach ( (array) $comments as $comment ) {
+        foreach ( $table->items as $comment ) {
                 get_comment( $comment );
                 ob_start();
@@ -661 +660 @@
         require_once( './includes/default-list-tables.php' );
         $table = new WP_Comments_Table();
-
-        global $comments;
-
-        if ( !$comments )
+        $table->prepare_items();
+
+        if ( !$table->has_items() )
                 die('1');
 
         $comment_list_item = '';
         $x = new WP_Ajax_Response();
-        foreach ( (array) $comments as $comment ) {
+        foreach ( $table->items as $comment ) {
                 get_comment( $comment );
                 ob_start();

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

@@ -2112 +2112 @@
 
         function prepare_items() {
-                global $comments, $extra_comments, $total_comments, $post_id, $comment_status, $mode;
+                global $post_id, $comment_status, $mode;
 
                 $post_id = isset( $_REQUEST['post_ID'] ) ? absint( $_REQUEST['post_ID'] ) : 0;

trunk/wp-admin/includes/meta-boxes.php

@@ -461 +461 @@
         wp_nonce_field( 'get-comments', 'add_comment_nonce', false );
         add_filter('manage_edit-comments_columns', 'post_comment_meta_box_thead', 8, 1);
+        add_filter('manage_edit-comments_sortable_columns', create_function('', 'return array();'), 8);
+
+        require_once( './includes/default-list-tables.php' );
+        $table = new WP_Comments_Table;
 ?>
 
 <table class="widefat comments-box fixed" cellspacing="0" style="display:none;">
 <thead><tr>
-        <?php print_column_headers('edit-comments'); ?>
+        <?php $table->print_column_headers(); ?>
 </tr></thead>
 <tbody id="the-comment-list" class="list:comment"></tbody>