Index: trunk/wp-admin/includes/class-wp-list-table.php =================================================================== --- trunk/wp-admin/includes/class-wp-list-table.php (revision 17321) +++ trunk/wp-admin/includes/class-wp-list-table.php (revision 17322) @@ -14,4 +14,5 @@ * @subpackage List_Table * @since 3.1.0 + * @access private */ class WP_List_Table { @@ -93,8 +94,8 @@ $this->_args = $args; - if ( $args['ajax'] ) { - wp_enqueue_script( 'list-table' ); - add_action( 'admin_footer', array( &$this, '_js_vars' ) ); - } + // if ( $args['ajax'] ) { + // wp_enqueue_script( 'list-table' ); + // add_action( 'admin_footer', array( &$this, '_js_vars' ) ); + // } } @@ -200,7 +201,6 @@ - 'search-submit') ); ?> + 'search-submit') ); ?>
- _pagination ) { - echo $this->_pagination; - return; - } - + function pagination( $which ) { if ( empty( $this->_pagination_args ) ) return; @@ -507,10 +502,14 @@ ); - $html_current_page = sprintf( "", - esc_attr__( 'Current page' ), - esc_attr( 'paged' ), - number_format_i18n( $current ), - strlen( $total_pages ) - ); + if ( 'bottom' == $which ) + $html_current_page = $current; + else + $html_current_page = sprintf( "", + esc_attr__( 'Current page' ), + esc_attr( 'paged' ), + $current, + strlen( $total_pages ) + ); + $html_total_pages = sprintf( "%s", number_format_i18n( $total_pages ) ); $page_links[] = '' . sprintf( _x( '%1$s of %2$s', 'paging' ), $html_current_page, $html_total_pages ) . ''; @@ -634,4 +633,5 @@ $current_url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']; + $current_url = remove_query_arg( 'paged', $current_url ); if ( isset( $_GET['orderby'] ) ) @@ -693,6 +693,4 @@ extract( $this->_args ); - wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' ); - $this->display_tablenav( 'top' ); @@ -749,9 +747,5 @@ $this->extra_tablenav( $which ); $this->pagination( $which ); - -if ( 'bottom' == $which ) { ?> - -