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

Timestamp:

09/19/2012 12:43:31 PM (13 years ago)

Author:

ryan

Message:

Reduce reliance on global variables in the list tables. Allow passing a screen ID to the list tables so that ajax handlers can set the needed screen.

Props nacin
fixes #21871

File:

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

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

@@ -82 +82 @@
             'plural' => '',
             'singular' => '',
-            'ajax' => false
+            'ajax' => false,
+            'screen' => null,
         ) );
 
-        $screen = get_current_screen();
-
-        add_filter( "manage_{$screen->id}_columns", array( &$this, 'get_columns' ), 0 );
+        $this->screen = convert_to_screen( $args['screen'] );
+
+        add_filter( "manage_{$this->screen->id}_columns", array( &$this, 'get_columns' ), 0 );
 
         if ( !$args['plural'] )
-            $args['plural'] = $screen->base;
+            $args['plural'] = $this->screen->base;
 
         $args['plural'] = sanitize_key( $args['plural'] );
@@ -243 +244 @@
      */
     function views() {
-        $screen = get_current_screen();
-
         $views = $this->get_views();
-        $views = apply_filters( 'views_' . $screen->id, $views );
+        $views = apply_filters( 'views_' . $this->screen->id, $views );
 
         if ( empty( $views ) )
@@ -279 +278 @@
      */
     function bulk_actions() {
-        $screen = get_current_screen();
-
         if ( is_null( $this->_actions ) ) {
             $no_new_actions = $this->_actions = $this->get_bulk_actions();
             // This filter can currently only be used to remove actions.
-            $this->_actions = apply_filters( 'bulk_actions-' . $screen->id, $this->_actions );
+            $this->_actions = apply_filters( 'bulk_actions-' . $this->screen->id, $this->_actions );
             $this->_actions = array_intersect_assoc( $this->_actions, $no_new_actions );
             $two = '';
@@ -605 +602 @@
             return $this->_column_headers;
 
-        $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() );
+        $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() );
 
         $sortable = array();
@@ -652 +647 @@
      */
     function print_column_headers( $with_id = true ) {
-        $screen = get_current_screen();
-
         list( $columns, $hidden, $sortable ) = $this->get_column_info();
 
@@ -915 +908 @@
      */
     function _js_vars() {
-        $current_screen = get_current_screen();
-
         $args = array(
             'class'  => get_class( $this ),
             'screen' => array(
-                'id'   => $current_screen->id,
-                'base' => $current_screen->base,
+                'id'   => $this->screen->id,
+                'base' => $this->screen->base,
             )
         );