Changes from branches/3.1/wp-admin/includes/class-wp-list-table.php at r17482 to trunk/wp-admin/includes/class-wp-list-table.php at r18254

File:

• trunk/wp-admin/includes/class-wp-list-table.php (modified) (4 diffs)

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

@@ -78 +78 @@
      * @access protected
      */
-    function WP_List_Table( $args = array() ) {
+    function __construct( $args = array() ) {
         $args = wp_parse_args( $args, array(
             'plural' => '',
@@ -139 +139 @@
         if ( !$args['total_pages'] && $args['per_page'] > 0 )
             $args['total_pages'] = ceil( $args['total_items'] / $args['per_page'] );
+
+        // redirect if page number is invalid and headers are not already sent
+        if ( ! headers_sent() && ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX ) && $args['total_pages'] > 0 && $this->get_pagenum() > $args['total_pages'] ) {
+            wp_redirect( add_query_arg( 'paged', $args['total_pages'] ) );
+            exit;
+        }
 
         $this->_pagination_args = $args;
@@ -283 +289 @@
         echo "<select name='action$two'>\n";
         echo "<option value='-1' selected='selected'>" . __( 'Bulk Actions' ) . "</option>\n";
-        foreach ( $this->_actions as $name => $title )
-            echo "\t<option value='$name'>$title</option>\n";
+
+        foreach ( $this->_actions as $name => $title ) {
+            $class = 'edit' == $name ? ' class="hide-if-no-js"' : '';
+
+            echo "\t<option value='$name'$class>$title</option>\n";
+        }
+
         echo "</select>\n";
 
@@ -529 +540 @@
         );
 
-        $output .= "\n" . join( "\n", $page_links );
-
-        $page_class = $total_pages < 2 ? ' one-page' : '';
+        $output .= "\n<span class='pagination-links'>" . join( "\n", $page_links ) . '</span>';
+
+        if ( $total_pages )
+            $page_class = $total_pages < 2 ? ' one-page' : '';
+        else
+            $page_class = ' no-pages';
 
         $this->_pagination = "<div class='tablenav-pages{$page_class}'>$output</div>";