X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/03f2fa83c13c1b532284205fa7efcab9b8b2c41f..refs/heads/pristine:/wp-admin/includes/list-table.php

diff --git a/wp-admin/includes/list-table.php b/wp-admin/includes/list-table.php
index 8120598a..e4c66d1f 100644
--- a/wp-admin/includes/list-table.php
+++ b/wp-admin/includes/list-table.php
@@ -66,61 +66,19 @@ function _get_list_table( $class, $args = array() ) {
  * @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
- */
-function print_column_headers($screen, $id = true) {
-	$wp_list_table = new _WP_List_Table_Compat($screen);
-
-	$wp_list_table->print_column_headers($id);
-}
-
-/**
- * Helper class to be used only by back compat functions
  *
- * @since 3.1.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.
  */
-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 );
-	}
+function print_column_headers( $screen, $with_id = true ) {
+	$wp_list_table = new _WP_List_Table_Compat($screen);
 
-	/**
-	 * @access public
-	 *
-	 * @return array
-	 */
-	public function get_columns() {
-		return $this->_columns;
-	}
+	$wp_list_table->print_column_headers( $with_id );
 }