Changeset 16235 for trunk/wp-admin/includes/class-wp-list-table.php

Timestamp:

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

Author:

scribu

Message:

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

File:

• trunk/wp-admin/includes/class-wp-list-table.php (modified) (7 diffs)

trunk/wp-admin/includes/class-wp-list-table.php

@@ -79 +79 @@
     function WP_List_Table( $args = array() ) {
         $args = wp_parse_args( $args, array(
-            'screen' => get_current_screen(),
             'plural' => '',
             'singular' => '',
@@ -85 +84 @@
         ) );
 
-        $this->screen = $args['screen'];
-
-        if ( is_string( $this->screen ) )
-            $this->screen = convert_to_screen( $this->screen );
-
-        add_filter( 'manage_' . $this->screen->id . '_columns', array( &$this, 'get_columns' ), 0 );
+        $screen = get_current_screen();
+
+        add_filter( "manage_{$screen->id}_columns", array( &$this, 'get_columns' ), 0 );
 
         if ( !$args['plural'] )
-            $args['plural'] = $this->screen->base;
+            $args['plural'] = $screen->base;
 
         $this->_args = $args;
@@ -204 +200 @@
      */
     function views() {
+        $screen = get_current_screen();
+
         $views = $this->get_views();
-        $views = apply_filters( 'views_' . $this->screen->id, $views );
+        $views = apply_filters( 'views_' . $screen->id, $views );
 
         if ( empty( $views ) )
@@ -238 +236 @@
      */
     function bulk_actions() {
+        $screen = get_current_screen();
 
         if ( is_null( $this->_actions ) ) {
             $this->_actions = $this->get_bulk_actions();
-            $this->_actions = apply_filters( 'bulk_actions-' . $this->screen->id, $this->_actions );
+            $this->_actions = apply_filters( 'bulk_actions-' . $screen->id, $this->_actions );
             $two = '';
         }
@@ -539 +538 @@
     function get_column_info() {
         if ( !isset( $this->_column_headers ) ) {
-            $columns = get_column_headers( $this->screen );
-            $hidden = get_hidden_columns( $this->screen );
-            $sortable = apply_filters( 'manage_' . $this->screen->id . '_sortable_columns', $this->get_sortable_columns() );
+            $screen = get_current_screen();
+
+            $columns = get_column_headers( $screen );
+            $hidden = get_hidden_columns( $screen );
+            $sortable = apply_filters( "manage_{$screen->id}_sortable_columns", $this->get_sortable_columns() );
 
             $this->_column_headers = array( $columns, $hidden, $sortable );
@@ -558 +559 @@
      */
     function print_column_headers( $with_id = true ) {
-        $screen = $this->screen;
+        $screen = get_current_screen();
 
         list( $columns, $hidden, $sortable ) = $this->get_column_info();
@@ -811 +812 @@
         $args = array(
             'class' => get_class( $this ),
-            'screen' => $this->screen
+            'screen' => get_current_screen()
         );