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

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

@@ -10 +10 @@
 class WP_Plugins_List_Table extends WP_List_Table {
 
-    function __construct() {
+    function __construct( $args = array() ) {
         global $status, $page;
+
+        parent::__construct( array(
+            'plural' => 'plugins',
+            'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
+        ) );
 
         $status = 'all';
@@ -21 +26 @@
 
         $page = $this->get_pagenum();
-
-        parent::__construct( array(
-            'plural' => 'plugins',
-        ) );
     }
 
@@ -51 +52 @@
         );
 
-        $screen = get_current_screen();
+        $screen = $this->screen;
 
         if ( ! is_multisite() || ( $screen->is_network && current_user_can('manage_network_plugins') ) ) {
@@ -92 +93 @@
                 $plugins['active'][ $plugin_file ] = $plugin_data;
             } else {
-                if ( !$screen->is_network && isset( $recently_activated[ $plugin_file ] ) ) // Was the plugin recently activated?
+                if ( ! $screen->is_network && isset( $recently_activated[ $plugin_file ] ) ) // Was the plugin recently activated?
                     $plugins['recently_activated'][ $plugin_file ] = $plugin_data;
                 $plugins['inactive'][ $plugin_file ] = $plugin_data;
@@ -237 +238 @@
         $actions = array();
 
-        $screen = get_current_screen();
-
         if ( 'active' != $status )
-            $actions['activate-selected'] = $screen->is_network ? __( 'Network Activate' ) : __( 'Activate' );
+            $actions['activate-selected'] = $this->screen->is_network ? __( 'Network Activate' ) : __( 'Activate' );
 
         if ( 'inactive' != $status && 'recent' != $status )
-            $actions['deactivate-selected'] = $screen->is_network ? __( 'Network Deactivate' ) : __( 'Deactivate' );
-
-        if ( !is_multisite() || $screen->is_network ) {
+            $actions['deactivate-selected'] = $this->screen->is_network ? __( 'Network Deactivate' ) : __( 'Deactivate' );
+
+        if ( !is_multisite() || $this->screen->is_network ) {
             if ( current_user_can( 'update_plugins' ) )
                 $actions['update-selected'] = __( 'Update' );
@@ -272 +271 @@
         echo '<div class="alignleft actions">';
 
-        $screen = get_current_screen();
-
-        if ( ! $screen->is_network && 'recently_activated' == $status )
+        if ( ! $this->screen->is_network && 'recently_activated' == $status )
             submit_button( __( 'Clear List' ), 'small', 'clear-recent-list', false );
         elseif ( 'top' == $which && 'mustuse' == $status )
@@ -294 +291 @@
         global $status;
 
-        $screen = get_current_screen();
-
-        if ( is_multisite() && !$screen->is_network && in_array( $status, array( 'mustuse', 'dropins' ) ) )
+        if ( is_multisite() && ! $this->screen->is_network && in_array( $status, array( 'mustuse', 'dropins' ) ) )
             return;
 
@@ -307 +302 @@
 
         $context = $status;
-
-        $screen = get_current_screen();
+        $screen = $this->screen;
 
         // preorder