Changeset 16235 for trunk/wp-admin/includes/deprecated.php

Timestamp:

11/08/2010 03:43:44 PM (14 years ago)

Author:

scribu

Message:

Use get_current_screen() in list table classes. Fixes #15338

File:

• trunk/wp-admin/includes/deprecated.php (modified) (3 diffs)

trunk/wp-admin/includes/deprecated.php

@@ -704 +704 @@
     _deprecated_function( __FUNCTION__, '3.1', 'WP_List_Table' );
 
-    global $wp_list_table;
-
-    $wp_list_table = new _WP_List_Table_Compat($screen);
-    $wp_list_table->_columns = $columns;
+    $wp_list_table = new _WP_List_Table_Compat($screen, $columns);
 }
 
@@ -720 +717 @@
     _deprecated_function( __FUNCTION__, '3.1', 'WP_List_Table' );
 
-    global $wp_list_table;
-    if ( !is_a($wp_list_table, 'WP_List_Table') )
-        $wp_list_table = new _WP_List_Table_Compat($screen);
+    $wp_list_table = new _WP_List_Table_Compat($screen);
 
     $wp_list_table->print_column_headers($id);
@@ -729 +724 @@
 // Helper class to be used only by deprecated functions
 class _WP_List_Table_Compat extends WP_List_Table {
-
-    var $_columns = array();
-
-    function _WP_List_Table_Compat( $screen ) {
-        parent::WP_List_Table( array(
-            'screen' => $screen,
-            'ajax' => false
-        ) );
+    var $_screen;
+    var $_columns;
+
+    function _WP_List_Table_Compat( $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 );
+        }
+    }
+
+    function get_column_info() {
+        $columns = get_column_headers( $this->_screen );
+        $hidden = get_hidden_columns( $this->_screen );
+        $sortable = array();
+
+        return array( $columns, $hidden, $sortable );
     }