From 06aa510d563ea6f85a75137247cd3eaf78a6dcc0 Mon Sep 17 00:00:00 2001 From: Scott Taylor Date: Fri, 26 Aug 2016 22:23:29 +0000 Subject: [PATCH] List Tables: move `_WP_List_Table_Compat` into its own file. See #37827. Built from https://develop.svn.wordpress.org/trunk@38392 git-svn-id: http://core.svn.wordpress.org/trunk@38333 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/admin.php | 1 + .../includes/class-wp-list-table-compat.php | 53 +++++++++++++++++++ wp-admin/includes/list-table.php | 45 ---------------- wp-includes/version.php | 2 +- 4 files changed, 55 insertions(+), 46 deletions(-) create mode 100644 wp-admin/includes/class-wp-list-table-compat.php diff --git a/wp-admin/includes/admin.php b/wp-admin/includes/admin.php index a44abba917..ee197714ad 100644 --- a/wp-admin/includes/admin.php +++ b/wp-admin/includes/admin.php @@ -61,6 +61,7 @@ require_once(ABSPATH . 'wp-admin/includes/template.php'); /** WordPress List Table Administration API and base class */ require_once(ABSPATH . 'wp-admin/includes/class-wp-list-table.php'); +require_once(ABSPATH . 'wp-admin/includes/class-wp-list-table-compat.php'); require_once(ABSPATH . 'wp-admin/includes/list-table.php'); /** WordPress Theme Administration API */ diff --git a/wp-admin/includes/class-wp-list-table-compat.php b/wp-admin/includes/class-wp-list-table-compat.php new file mode 100644 index 0000000000..128764793a --- /dev/null +++ b/wp-admin/includes/class-wp-list-table-compat.php @@ -0,0 +1,53 @@ +_screen = $screen; + + if ( !empty( $columns ) ) { + $this->_columns = $columns; + add_filter( 'manage_' . $screen->id . '_columns', array( $this, 'get_columns' ), 0 ); + } + } + + /** + * @access protected + * + * @return array + */ + protected function get_column_info() { + $columns = get_column_headers( $this->_screen ); + $hidden = get_hidden_columns( $this->_screen ); + $sortable = array(); + $primary = $this->get_default_primary_column_name(); + + return array( $columns, $hidden, $sortable, $primary ); + } + + /** + * @access public + * + * @return array + */ + public function get_columns() { + return $this->_columns; + } +} diff --git a/wp-admin/includes/list-table.php b/wp-admin/includes/list-table.php index bcc182c866..124b60b219 100644 --- a/wp-admin/includes/list-table.php +++ b/wp-admin/includes/list-table.php @@ -82,48 +82,3 @@ function print_column_headers( $screen, $with_id = true ) { $wp_list_table->print_column_headers( $with_id ); } - -/** - * Helper class to be used only by back compat functions - * - * @since 3.1.0 - */ -class _WP_List_Table_Compat extends WP_List_Table { - public $_screen; - public $_columns; - - public function __construct( $screen, $columns = array() ) { - if ( is_string( $screen ) ) - $screen = convert_to_screen( $screen ); - - $this->_screen = $screen; - - if ( !empty( $columns ) ) { - $this->_columns = $columns; - add_filter( 'manage_' . $screen->id . '_columns', array( $this, 'get_columns' ), 0 ); - } - } - - /** - * @access protected - * - * @return array - */ - protected function get_column_info() { - $columns = get_column_headers( $this->_screen ); - $hidden = get_hidden_columns( $this->_screen ); - $sortable = array(); - $primary = $this->get_default_primary_column_name(); - - return array( $columns, $hidden, $sortable, $primary ); - } - - /** - * @access public - * - * @return array - */ - public function get_columns() { - return $this->_columns; - } -} diff --git a/wp-includes/version.php b/wp-includes/version.php index d541c24398..098ec06fa8 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.7-alpha-38391'; +$wp_version = '4.7-alpha-38392'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.