Changeset 16465

Timestamp:

11/18/2010 05:00:24 PM (16 years ago)

Author:

scribu

Message:

Always use 'paged' in list tables. See #14579

Location:

trunk/wp-admin/includes

Files:

• class-wp-list-table.php (modified) (8 diffs)
• class-wp-themes-list-table.php (modified) (1 diff)

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

@@ -129 +129 @@
         function set_pagination_args( $args ) {
                 $args = wp_parse_args( $args, array(
-                        'query_var' => 'paged',
                         'total_items' => 0,
                         'total_pages' => 0,
@@ -410 +409 @@
          * @return int
          */
-        function get_pagenum( $query_var = 'paged' ) {
-                $pagenum = isset( $_REQUEST[$query_var] ) ? absint( $_REQUEST[$query_var] ) : 0;
+        function get_pagenum() {
+                $pagenum = isset( $_REQUEST['paged'] ) ? absint( $_REQUEST['paged'] ) : 0;
 
                 return max( 1, $pagenum );
@@ -454 +453 @@
                 $output = '<span class="displaying-num">' . sprintf( _n( '1 item', '%s items', $total_items ), number_format_i18n( $total_items ) ) . '</span>';
 
-                $current = $this->get_pagenum( $query_var );
+                $current = $this->get_pagenum();
 
                 $current_url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
@@ -463 +462 @@
                         'first-page',
                         esc_attr__( 'Go to the first page' ),
-                        esc_url( remove_query_arg( $query_var, $current_url ) ),
+                        esc_url( remove_query_arg( 'paged', $current_url ) ),
                         '&laquo;&laquo;'
                 );
@@ -470 +469 @@
                         'prev-page',
                         esc_attr__( 'Go to the previous page' ),
-                        esc_url( add_query_arg( $query_var, max( 1, $current-1 ), $current_url ) ),
+                        esc_url( add_query_arg( 'paged', max( 1, $current-1 ), $current_url ) ),
                         '&laquo;'
                 );
@@ -476 +475 @@
                 $html_current_page = sprintf( "<input class='current-page' title='%s' type='text' name='%s' value='%s' size='%d' />",
                         esc_attr__( 'Current page' ),
-                        esc_attr( $query_var ),
+                        esc_attr( 'paged' ),
                         number_format_i18n( $current ),
                         strlen( $total_pages )
@@ -486 +485 @@
                         'next-page',
                         esc_attr__( 'Go to the next page' ),
-                        esc_url( add_query_arg( $query_var, min( $total_pages, $current+1 ), $current_url ) ),
+                        esc_url( add_query_arg( 'paged', min( $total_pages, $current+1 ), $current_url ) ),
                         '&raquo;'
                 );
@@ -493 +492 @@
                         'last-page',
                         esc_attr__( 'Go to the last page' ),
-                        esc_url( add_query_arg( $query_var, $total_pages, $current_url ) ),
+                        esc_url( add_query_arg( 'paged', $total_pages, $current_url ) ),
                         '&raquo;&raquo;'
                 );

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

@@ -56 +56 @@
 
                 $this->set_pagination_args( array(
-                        'query_var' => 'pagenum',
                         'total_items' => count( $themes ),
                         'per_page' => $per_page,