Changeset 16371

Timestamp:

11/14/2010 06:19:45 PM (14 years ago)

Author:

scribu

Message:

Fix post comments box and remove unused 'add-comment' ajax action. See #15338

Location:

trunk/wp-admin

Files:

• admin-ajax.php (modified) (5 diffs)
• includes/class-wp-comments-list-table.php (modified) (2 diffs)

trunk/wp-admin/admin-ajax.php

@@ -520 +520 @@
     }
 
-    if ( isset($_POST['screen']) )
-        set_current_screen($_POST['screen']);
+    set_current_screen( $_POST['screen'] );
 
     $wp_list_table = get_list_table('WP_Terms_List_Table');
@@ -582 +581 @@
     exit;
     break;
-case 'add-comment' :
-    check_ajax_referer( $action );
-    if ( !current_user_can( 'edit_posts' ) )
-        die('-1');
-
-    $wp_list_table = get_list_table('WP_Comments_List_Table');
-    $wp_list_table->from_ajax = true;
-
-    $wp_list_table->prepare_items();
-
-    if ( !$wp_list_table->has_items() )
-        die('1');
-
-    $x = new WP_Ajax_Response();
-    foreach ( $wp_list_table->items as $comment ) {
-        ob_start();
-            $wp_list_table->single_row( $comment );
-            $comment_list_item = ob_get_contents();
-        ob_end_clean();
-        $x->add( array(
-            'what' => 'comment',
-            'id' => $comment->comment_ID,
-            'data' => $comment_list_item
-        ) );
-    }
-    $x->send();
-    break;
 case 'get-comments' :
     check_ajax_referer( $action );
@@ -615 +587 @@
     if ( !current_user_can( 'edit_post', $post_ID ) )
         die('-1');
+
+    set_current_screen( 'edit-comments' );
 
     $wp_list_table = get_list_table('WP_Post_Comments_List_Table');
@@ -1162 +1136 @@
     }
 
-    if ( isset($_POST['screen']) )
-        set_current_screen($_POST['screen']);
+    set_current_screen( $_POST['screen'] );
 
     if ( $last = wp_check_post_lock( $post_ID ) ) {
@@ -1210 +1183 @@
     check_ajax_referer( 'taxinlineeditnonce', '_inline_edit' );
 
-    set_current_screen('edit-' . $_POST['taxonomy']);
+    set_current_screen( 'edit-' . $_POST['taxonomy'] );
 
     $wp_list_table = get_list_table('WP_Terms_List_Table');

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

@@ -18 +18 @@
 
     var $checkbox = true;
-    var $from_ajax = false;
 
     var $pending_count = array();
@@ -412 +411 @@
 
                 // Reply and quickedit need a hide-if-no-js span when not added with ajax
-                if ( ( 'reply' == $action || 'quickedit' == $action ) && ! $this->from_ajax )
+                if ( ( 'reply' == $action || 'quickedit' == $action ) && ! defined('DOING_AJAX') )
                     $action .= ' hide-if-no-js';
                 elseif ( ( $action == 'untrash' && $the_comment_status == 'trash' ) || ( $action == 'unspam' && $the_comment_status == 'spam' ) ) {