diff --git a/wp-admin/edit-comments.php b/wp-admin/edit-comments.php index 15b87e3b0..269dbff55 100644 --- a/wp-admin/edit-comments.php +++ b/wp-admin/edit-comments.php @@ -11,7 +11,7 @@ require_once('./admin.php'); if ( !current_user_can('edit_posts') ) wp_die(__('Cheatin’ uh?')); -$wp_list_table = get_list_table('WP_Comments_List_Table'); +$wp_list_table = _get_list_table('WP_Comments_List_Table'); $pagenum = $wp_list_table->get_pagenum(); $doaction = $wp_list_table->current_action(); diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php index cfaba6ce5..13534de06 100644 --- a/wp-admin/edit-tags.php +++ b/wp-admin/edit-tags.php @@ -12,7 +12,7 @@ $tax = get_taxonomy( $taxnow ); if ( !current_user_can( $tax->cap->manage_terms ) ) wp_die( __( 'Cheatin’ uh?' ) ); -$wp_list_table = get_list_table('WP_Terms_List_Table'); +$wp_list_table = _get_list_table('WP_Terms_List_Table'); $title = $tax->labels->name; diff --git a/wp-admin/edit.php b/wp-admin/edit.php index 5e0154f80..5c7b194dc 100644 --- a/wp-admin/edit.php +++ b/wp-admin/edit.php @@ -23,7 +23,7 @@ $post_type_object = get_post_type_object( $post_type ); if ( !current_user_can($post_type_object->cap->edit_posts) ) wp_die(__('Cheatin’ uh?')); -$wp_list_table = get_list_table('WP_Posts_List_Table'); +$wp_list_table = _get_list_table('WP_Posts_List_Table'); $pagenum = $wp_list_table->get_pagenum(); // Back-compat for viewing comments of an entry diff --git a/wp-admin/includes/class-wp-comments-list-table.php b/wp-admin/includes/class-wp-comments-list-table.php index 0cba0a1ed..5864e3bf5 100644 --- a/wp-admin/includes/class-wp-comments-list-table.php +++ b/wp-admin/includes/class-wp-comments-list-table.php @@ -13,6 +13,7 @@ * @package WordPress * @subpackage List_Table * @since 3.1.0 + * @access private */ class WP_Comments_List_Table extends WP_List_Table { @@ -266,7 +267,7 @@ class WP_Comments_List_Table extends WP_List_Table { function display() { extract( $this->_args ); - wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' ); + // wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' ); $this->display_tablenav( 'top' ); @@ -509,6 +510,7 @@ class WP_Comments_List_Table extends WP_List_Table { * @package WordPress * @subpackage List_Table * @since 3.1.0 + * @access private * * @see WP_Comments_Table */ @@ -536,7 +538,7 @@ class WP_Post_Comments_List_Table extends WP_Comments_List_Table { function display( $output_empty = false ) { extract( $this->_args ); - wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' ); + // wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' ); ?> > diff --git a/wp-admin/includes/class-wp-links-list-table.php b/wp-admin/includes/class-wp-links-list-table.php index 910d6c40c..316bf92e8 100644 --- a/wp-admin/includes/class-wp-links-list-table.php +++ b/wp-admin/includes/class-wp-links-list-table.php @@ -5,6 +5,7 @@ * @package WordPress * @subpackage List_Table * @since 3.1.0 + * @access private */ class WP_Links_List_Table extends WP_List_Table { diff --git a/wp-admin/includes/class-wp-list-table.php b/wp-admin/includes/class-wp-list-table.php index 3b9e418e6..13a688cc9 100644 --- a/wp-admin/includes/class-wp-list-table.php +++ b/wp-admin/includes/class-wp-list-table.php @@ -13,6 +13,7 @@ * @package WordPress * @subpackage List_Table * @since 3.1.0 + * @access private */ class WP_List_Table { @@ -92,10 +93,10 @@ class WP_List_Table { $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' ) ); + // } } /** @@ -199,9 +200,8 @@ class WP_List_Table { -_pagination ) { - echo $this->_pagination; - return; - } - + function pagination( $which ) { if ( empty( $this->_pagination_args ) ) return; @@ -506,12 +501,16 @@ class WP_List_Table { '‹' ); - $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 ) . ''; @@ -633,6 +632,7 @@ class WP_List_Table { list( $columns, $hidden, $sortable ) = $this->get_column_info(); $current_url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']; + $current_url = remove_query_arg( 'paged', $current_url ); if ( isset( $_GET['orderby'] ) ) $current_orderby = $_GET['orderby']; @@ -692,8 +692,6 @@ class WP_List_Table { function display() { extract( $this->_args ); - wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' ); - $this->display_tablenav( 'top' ); ?> @@ -748,11 +746,7 @@ class WP_List_Table { extra_tablenav( $which ); $this->pagination( $which ); - -if ( 'bottom' == $which ) { ?> - -
diff --git a/wp-admin/includes/class-wp-media-list-table.php b/wp-admin/includes/class-wp-media-list-table.php index 11d9e05fd..b125b1499 100644 --- a/wp-admin/includes/class-wp-media-list-table.php +++ b/wp-admin/includes/class-wp-media-list-table.php @@ -5,6 +5,7 @@ * @package WordPress * @subpackage List_Table * @since 3.1.0 + * @access private */ class WP_Media_List_Table extends WP_List_Table { diff --git a/wp-admin/includes/class-wp-ms-sites-list-table.php b/wp-admin/includes/class-wp-ms-sites-list-table.php index 4f25072f6..f4ceb00f7 100644 --- a/wp-admin/includes/class-wp-ms-sites-list-table.php +++ b/wp-admin/includes/class-wp-ms-sites-list-table.php @@ -5,6 +5,7 @@ * @package WordPress * @subpackage List_Table * @since 3.1.0 + * @access private */ class WP_MS_Sites_List_Table extends WP_List_Table { diff --git a/wp-admin/includes/class-wp-ms-themes-list-table.php b/wp-admin/includes/class-wp-ms-themes-list-table.php index 77aa75c58..aacdb42a2 100644 --- a/wp-admin/includes/class-wp-ms-themes-list-table.php +++ b/wp-admin/includes/class-wp-ms-themes-list-table.php @@ -5,6 +5,7 @@ * @package WordPress * @subpackage List_Table * @since 3.1.0 + * @access private */ class WP_MS_Themes_List_Table extends WP_List_Table { diff --git a/wp-admin/includes/class-wp-ms-users-list-table.php b/wp-admin/includes/class-wp-ms-users-list-table.php index c3bfec28e..36d55e1ca 100644 --- a/wp-admin/includes/class-wp-ms-users-list-table.php +++ b/wp-admin/includes/class-wp-ms-users-list-table.php @@ -5,6 +5,7 @@ * @package WordPress * @subpackage List_Table * @since 3.1.0 + * @access private */ class WP_MS_Users_List_Table extends WP_List_Table { diff --git a/wp-admin/includes/class-wp-plugin-install-list-table.php b/wp-admin/includes/class-wp-plugin-install-list-table.php index a60a66f38..0ec8ebb61 100644 --- a/wp-admin/includes/class-wp-plugin-install-list-table.php +++ b/wp-admin/includes/class-wp-plugin-install-list-table.php @@ -5,6 +5,7 @@ * @package WordPress * @subpackage List_Table * @since 3.1.0 + * @access private */ class WP_Plugin_Install_List_Table extends WP_List_Table { diff --git a/wp-admin/includes/class-wp-plugins-list-table.php b/wp-admin/includes/class-wp-plugins-list-table.php index 7919b9e5e..86e6b4e59 100644 --- a/wp-admin/includes/class-wp-plugins-list-table.php +++ b/wp-admin/includes/class-wp-plugins-list-table.php @@ -5,6 +5,7 @@ * @package WordPress * @subpackage List_Table * @since 3.1.0 + * @access private */ class WP_Plugins_List_Table extends WP_List_Table { diff --git a/wp-admin/includes/class-wp-posts-list-table.php b/wp-admin/includes/class-wp-posts-list-table.php index e62259952..3dfd76afe 100644 --- a/wp-admin/includes/class-wp-posts-list-table.php +++ b/wp-admin/includes/class-wp-posts-list-table.php @@ -5,6 +5,7 @@ * @package WordPress * @subpackage List_Table * @since 3.1.0 + * @access private */ class WP_Posts_List_Table extends WP_List_Table { diff --git a/wp-admin/includes/class-wp-terms-list-table.php b/wp-admin/includes/class-wp-terms-list-table.php index 2277d90ff..b17e96dc4 100644 --- a/wp-admin/includes/class-wp-terms-list-table.php +++ b/wp-admin/includes/class-wp-terms-list-table.php @@ -5,6 +5,7 @@ * @package WordPress * @subpackage List_Table * @since 3.1.0 + * @access private */ class WP_Terms_List_Table extends WP_List_Table { diff --git a/wp-admin/includes/class-wp-theme-install-list-table.php b/wp-admin/includes/class-wp-theme-install-list-table.php index d3d30693d..7e44267c8 100644 --- a/wp-admin/includes/class-wp-theme-install-list-table.php +++ b/wp-admin/includes/class-wp-theme-install-list-table.php @@ -5,6 +5,7 @@ * @package WordPress * @subpackage List_Table * @since 3.1.0 + * @access private */ class WP_Theme_Install_List_Table extends WP_List_Table { @@ -127,7 +128,7 @@ class WP_Theme_Install_List_Table extends WP_List_Table { function display() { - wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' ); + // wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' ); ?>
diff --git a/wp-admin/includes/class-wp-themes-list-table.php b/wp-admin/includes/class-wp-themes-list-table.php index ed84e1dbd..71bea8b40 100644 --- a/wp-admin/includes/class-wp-themes-list-table.php +++ b/wp-admin/includes/class-wp-themes-list-table.php @@ -5,6 +5,7 @@ * @package WordPress * @subpackage List_Table * @since 3.1.0 + * @access private */ class WP_Themes_List_Table extends WP_List_Table { @@ -101,7 +102,7 @@ class WP_Themes_List_Table extends WP_List_Table { } function display() { - wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' ); + // wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' ); ?> tablenav( 'top' ); ?> diff --git a/wp-admin/includes/class-wp-users-list-table.php b/wp-admin/includes/class-wp-users-list-table.php index 1d26589f7..e77810130 100644 --- a/wp-admin/includes/class-wp-users-list-table.php +++ b/wp-admin/includes/class-wp-users-list-table.php @@ -5,6 +5,7 @@ * @package WordPress * @subpackage List_Table * @since 3.1.0 + * @access private */ class WP_Users_List_Table extends WP_List_Table { diff --git a/wp-admin/includes/list-table.php b/wp-admin/includes/list-table.php index cd918ed90..716e80aca 100644 --- a/wp-admin/includes/list-table.php +++ b/wp-admin/includes/list-table.php @@ -10,32 +10,13 @@ /** * Fetch an instance of a WP_List_Table class. * + * @access private * @since 3.1.0 * - * @param string $class The type of the list table, which is the class name except for core list tables. + * @param string $class The type of the list table, which is the class name. * @return object|bool Object on success, false if the class does not exist. */ -function get_list_table( $class ) { - $class = apply_filters( "get_list_table_$class", $class ); - - require_list_table( $class ); - - if ( class_exists( $class ) ) - return new $class; - return false; -} - -/** - * Include the proper file for a core list table. - * - * Useful for extending a core class that would not otherwise be required. - * - * @since 3.1.0 - * - * @param string $table The core table to include. - * @return bool True on success, false on failure. - */ -function require_list_table( $class ) { +function _get_list_table( $class ) { $core_classes = array( //Site Admin 'WP_Posts_List_Table' => 'posts', @@ -57,7 +38,7 @@ function require_list_table( $class ) { if ( isset( $core_classes[ $class ] ) ) { require_once( ABSPATH . 'wp-admin/includes/class-wp-' . $core_classes[ $class ] . '-list-table.php' ); - return true; + return new $class; } return false; diff --git a/wp-admin/includes/meta-boxes.php b/wp-admin/includes/meta-boxes.php index e50fcc8b8..a84ac16fa 100644 --- a/wp-admin/includes/meta-boxes.php +++ b/wp-admin/includes/meta-boxes.php @@ -484,7 +484,7 @@ function post_comment_meta_box($post) { wp_nonce_field( 'get-comments', 'add_comment_nonce', false ); - $wp_list_table = get_list_table('WP_Post_Comments_List_Table'); + $wp_list_table = _get_list_table('WP_Post_Comments_List_Table'); $wp_list_table->display( true ); ?>

diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php index eda0ae67d..245cf59dd 100644 --- a/wp-admin/includes/template.php +++ b/wp-admin/includes/template.php @@ -332,9 +332,9 @@ function wp_comment_reply($position = '1', $checkbox = false, $mode = 'single', } if ( $mode == 'single' ) { - $wp_list_table = get_list_table('WP_Post_Comments_List_Table'); + $wp_list_table = _get_list_table('WP_Post_Comments_List_Table'); } else { - $wp_list_table = get_list_table('WP_Comments_List_Table'); + $wp_list_table = _get_list_table('WP_Comments_List_Table'); } ?> diff --git a/wp-admin/includes/update.php b/wp-admin/includes/update.php index e21816da2..06e06c24b 100644 --- a/wp-admin/includes/update.php +++ b/wp-admin/includes/update.php @@ -194,7 +194,7 @@ function wp_plugin_update_row( $file, $plugin_data ) { $details_url = self_admin_url('plugin-install.php?tab=plugin-information&plugin=' . $r->slug . '&TB_iframe=true&width=600&height=800'); - $wp_list_table = get_list_table('WP_Plugins_List_Table'); + $wp_list_table = _get_list_table('WP_Plugins_List_Table'); if ( is_network_admin() || !is_multisite() ) { echo '