diff -r 490d5cc509ed -r cf61fcea0001 wp/wp-admin/includes/list-table.php --- a/wp/wp-admin/includes/list-table.php Tue Jun 09 11:14:17 2015 +0000 +++ b/wp/wp-admin/includes/list-table.php Mon Oct 14 17:39:30 2019 +0200 @@ -13,6 +13,8 @@ * @access private * @since 3.1.0 * + * @global string $hook_suffix + * * @param string $class The type of the list table, which is the class name. * @param array $args Optional. Arguments to pass to the class. Accepts 'screen'. * @return object|bool Object on success, false if the class does not exist. @@ -25,7 +27,7 @@ 'WP_Terms_List_Table' => 'terms', 'WP_Users_List_Table' => 'users', 'WP_Comments_List_Table' => 'comments', - 'WP_Post_Comments_List_Table' => 'comments', + 'WP_Post_Comments_List_Table' => array( 'comments', 'post-comments' ), 'WP_Links_List_Table' => 'links', 'WP_Plugin_Install_List_Table' => 'plugin-install', 'WP_Themes_List_Table' => 'themes', @@ -64,50 +66,19 @@ * @see get_column_headers(), print_column_headers(), get_hidden_columns() */ function register_column_headers($screen, $columns) { - $wp_list_table = new _WP_List_Table_Compat($screen, $columns); + new _WP_List_Table_Compat( $screen, $columns ); } /** * Prints column headers for a particular screen. * * @since 2.7.0 + * + * @param string|WP_Screen $screen The screen hook name or screen object. + * @param bool $with_id Whether to set the id attribute or not. */ -function print_column_headers($screen, $id = true) { +function print_column_headers( $screen, $with_id = true ) { $wp_list_table = new _WP_List_Table_Compat($screen); - $wp_list_table->print_column_headers($id); + $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 ); - } - } - - protected function get_column_info() { - $columns = get_column_headers( $this->_screen ); - $hidden = get_hidden_columns( $this->_screen ); - $sortable = array(); - - return array( $columns, $hidden, $sortable ); - } - - public function get_columns() { - return $this->_columns; - } -}