Ticket #16166: garyc40.16166.2.diff

wp-admin/edit-comments.php

@@ -12 +12 @@
         wp_die(__('Cheatin’ uh?'));
 
 $wp_list_table = get_list_table('WP_Comments_List_Table');
-$pagenum = $wp_list_table->get_pagenum();
-
 $doaction = $wp_list_table->current_action();
 
 if ( $doaction ) {
@@ -37 +35 @@
         $approved = $unapproved = $spammed = $unspammed = $trashed = $untrashed = $deleted = 0;
 
         $redirect_to = remove_query_arg( array( 'trashed', 'untrashed', 'deleted', 'spammed', 'unspammed', 'approved', 'unapproved', 'ids' ), wp_get_referer() );
-        $redirect_to = add_query_arg( 'paged', $pagenum, $redirect_to );
+        $redirect_to = $wp_list_table->add_query_args( $redirect_to );
 
         foreach ( $comment_ids as $comment_id ) { // Check the permissions on each
                 if ( !current_user_can( 'edit_comment', $comment_id ) )
@@ -102 +100 @@
 $wp_list_table->prepare_items();
 
 $total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
-if ( $pagenum > $total_pages && $total_pages > 0 ) {
+if ( $wp_list_table->get_pagenum() > $total_pages && $total_pages > 0 ) {
         wp_redirect( add_query_arg( 'paged', $total_pages ) );
         exit;
 }

wp-admin/edit-tags.php

@@ -78 +78 @@
 
         wp_delete_term( $tag_ID, $taxonomy );
 
+        $location = $wp_list_table->add_query_args( $location );
         $location = add_query_arg( 'message', 2, $location );
         wp_redirect( $location );
         exit;
@@ -102 +103 @@
                 if ( false !== strpos( $referer, 'edit-tags.php' ) )
                         $location = $referer;
         }
-
+        
         $location = add_query_arg( 'message', 6, $location );
+        $location = $wp_list_table->add_query_args( $location );
+
         wp_redirect( $location );
         exit;
 

wp-admin/edit.php

@@ -24 +24 @@
         wp_die(__('Cheatin’ uh?'));
 
 $wp_list_table = get_list_table('WP_Posts_List_Table');
-$pagenum = $wp_list_table->get_pagenum();
 
 // Back-compat for viewing comments of an entry
 foreach ( array( 'p', 'attachment_id', 'page_id' ) as $_redirect ) {
@@ -41 +40 @@
         check_admin_referer('bulk-posts');
 
         $sendback = remove_query_arg( array('trashed', 'untrashed', 'deleted', 'ids'), wp_get_referer() );
-        $sendback = add_query_arg( 'paged', $pagenum, $sendback );
+        $sendback = $wp_list_table->add_query_args( $sendback );
         if ( strpos($sendback, 'post.php') !== false )
                 $sendback = admin_url($post_new_file);
 
@@ -143 +142 @@
 $wp_list_table->prepare_items();
 
 $total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
-if ( $pagenum > $total_pages && $total_pages > 0 ) {
+if ( $wp_list_table->get_pagenum() > $total_pages && $total_pages > 0 ) {
         wp_redirect( add_query_arg( 'paged', $total_pages ) );
         exit;
 }

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

@@ -611 +611 @@
                 $hidden = array_intersect( array_keys( $columns ), array_filter( $hidden ) );
                 return count( $columns ) - count( $hidden );
         }
+        
+        function get_order_info() {
+                if ( isset( $_GET['orderby'] ) )
+                        $current_orderby = $_GET['orderby'];
+                else
+                        $current_orderby = '';
+
+                if ( ! $current_orderby )
+                        $current_order = '';
+                elseif ( isset( $_GET['order'] ) && 'desc' == $_GET['order'] )
+                        $current_order = 'desc';
+                else
+                        $current_order = 'asc';
+                        
+                return array($current_orderby, $current_order);
+        }
+        
+        function add_query_args( $location ) {
+                $pagenum = $this->get_pagenum();
+                list( $current_orderby, $current_order ) = $this->get_order_info();
+                $location = add_query_arg( 'paged', $pagenum, $location );
+                if ( $current_orderby )
+                        $location = add_query_arg( array( 'orderby' => $current_orderby, 'order' => $current_order ), $location );
+                
+                return $location;
+        }
 
         /**
          * Print column headers, accounting for hidden and sortable columns.
@@ -627 +653 @@
 
                 $current_url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
 
-                if ( isset( $_GET['orderby'] ) )
-                        $current_orderby = $_GET['orderby'];
-                else
-                        $current_orderby = '';
-
-                if ( isset( $_GET['order'] ) && 'desc' == $_GET['order'] )
-                        $current_order = 'desc';
-                else
-                        $current_order = 'asc';
+                list( $current_orderby, $current_order ) = $this->get_order_info();
 
                 foreach ( $columns as $column_key => $column_display_name ) {
                         $class = array( 'manage-column', "column-$column_key" );
@@ -728 +746 @@
          * @access protected
          */
         function display_tablenav( $which ) {
-                if ( 'top' == $which )
+                if ( 'top' == $which ) {
                         wp_nonce_field( 'bulk-' . $this->_args['plural'] );
+                        list( $current_orderby, $current_order ) = $this->get_order_info();
+                        echo '<input type="hidden" name="orderby" value="' . $current_orderby . '" /><input type="hidden" name="order" value="' . $current_order . '" />';
+                }
 ?>
         <div class="tablenav <?php echo esc_attr( $which ); ?>">
 

wp-admin/js/list-table.dev.js

@@ -103 +103 @@
                 if ( 'object' != typeof response ) {
                         this.handle_error();
                 } else {
-                        var tablenav = $('.tablenav-pages');
+                        var tablenav = $('.tablenav-pages'),
+                                order = $.query.GET('order'),
+                                orderby = (order) ? $.query.GET('orderby') : '';
 
                         this.stop_loading();
 
@@ -124 +126 @@
                         // Disable buttons that should noop.
                         tablenav.find('.first-page, .prev-page').toggleClass('disabled', 1 == $.query.GET('paged'));
                         tablenav.find('.next-page, .last-page').toggleClass('disabled', response.total_pages == $.query.GET('paged'));
-
+                        
+                        $('input[name=order]').val(order);
+                        $('input[name=orderby]').val(orderby);
+                        
                         $('th.column-cb :input').attr('checked', false);
 
                         if ( history.replaceState ) {