Changeset 21914 for trunk/wp-admin/includes/class-wp-users-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-users-list-table.php (modified) (1 diff)

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

@@ -13 +13 @@
     var $is_site_users;
 
-    function __construct() {
-        $screen = get_current_screen();
-        $this->is_site_users = 'site-users-network' == $screen->id;
-
-        if ( $this->is_site_users )
-            $this->site_id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
-
+    function __construct( $args = array() ) {
         parent::__construct( array(
             'singular' => 'user',
-            'plural'   => 'users'
+            'plural'   => 'users',
+            'screen'   => isset( $args['screen'] ) ? $args['screen'] : null,
         ) );
+
+        $this->is_site_users = 'site-users-network' == $this->screen->id;
+
+        if ( $this->is_site_users )
+            $this->site_id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
     }