Changeset 15508

Timestamp:

08/18/2010 10:26:22 PM (14 years ago)

Author:

scribu

Message:

Fix the Trash quickling in edit-comments.php. See #14637

Location:

trunk/wp-admin

Files:

• admin-ajax.php (modified) (1 diff)
• edit-comments.php (modified) (2 diffs)
• includes/default-list-tables.php (modified) (2 diffs)
• includes/list-table.php (modified) (1 diff)
• js/edit-comments.dev.js (modified) (1 diff)

trunk/wp-admin/admin-ajax.php

@@ -640 +640 @@
         get_comment( $comment );
         ob_start();
-            $table->single_row( $comment->comment_ID, $mode, $status, true, true );
+            $table->single_row( $comment->comment_ID, $mode, $comment_status, true, true );
             $comment_list_item = ob_get_contents();
         ob_end_clean();

trunk/wp-admin/edit-comments.php

@@ -258 +258 @@
 <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($total); ?>" />
-<input type="hidden" name="_per_page" value="<?php echo esc_attr($comments_per_page); ?>" />
-<input type="hidden" name="_page" value="<?php echo esc_attr($page); ?>" />
+<input type="hidden" name="_total" value="<?php echo esc_attr( $table->get_pagination_arg('total_items') ); ?>" />
+<input type="hidden" name="_per_page" value="<?php echo esc_attr( $table->get_pagination_arg('per_page') ); ?>" />
+<input type="hidden" name="_page" value="<?php echo esc_attr( $table->get_pagination_arg('page') ); ?>" />
 
 <?php if ( isset($_REQUEST['paged']) ) { ?>
@@ -279 +279 @@
     <input type="hidden" name="mode" value="<?php echo esc_attr($mode); ?>" />
     <input type="hidden" name="comment_status" value="<?php echo esc_attr($comment_status); ?>" />
-    <input type="hidden" name="page" value="<?php echo esc_attr($page); ?>" />
-    <input type="hidden" name="per_page" value="<?php echo esc_attr($comments_per_page); ?>" />
+    <input type="hidden" name="page" value="<?php echo esc_attr( $table->get_pagination_arg('page') ); ?>" />
+    <input type="hidden" name="per_page" value="1" />
     <input type="hidden" name="p" value="<?php echo esc_attr( $post_id ); ?>" />
     <input type="hidden" name="comment_type" value="<?php echo esc_attr( $comment_type ); ?>" />

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

@@ -1942 +1942 @@
 
     function prepare_items() {
-        global $post_id, $comment_status, $mode;
+        global $post_id, $comment_status, $mode, $search;
 
         $post_id = isset( $_REQUEST['p'] ) ? absint( $_REQUEST['p'] ) : 0;
@@ -1956 +1956 @@
         $search = ( isset( $_REQUEST['s'] ) ) ? $_REQUEST['s'] : '';
 
-        if ( isset( $_POST['num'] ) )
-            $comments_per_page = $_POST['num'];
+        if ( isset( $_POST['per_page'] ) )
+            $comments_per_page = $_POST['per_page'];
         else
             $comments_per_page = (int) get_user_option( 'edit_comments_per_page' );

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

@@ -134 +134 @@
 
         $this->_pagination_args = $args;
+    }
+
+    /**
+     * Access the pagination args
+     *
+     * @since 3.1.0
+     * @access public
+     *
+     * @param string $key
+     * @return array
+     */
+    function get_pagination_arg( $key ) {
+        if ( 'page' == $key )
+            return $this->get_pagenum();
+
+        return @$this->_pagination_args[ $key ];
     }
 

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

@@ -210 +210 @@
 
         theList.get(0).wpList.add( theExtraList.children(':eq(0)').remove().clone() );
-//      $('#get-extra-comments').submit(); See http://core.trac.wordpress.org/ticket/14637
+        $('#get-extra-comments').submit();
     };