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

Timestamp:

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

Author:

scribu

Message:

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

File:

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

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

@@ -58 +58 @@
                 );
 
-                if ( ! is_multisite() || ( $this->screen->is_network && current_user_can('manage_network_plugins') ) ) {
+                $screen = get_current_screen();
+
+                if ( ! is_multisite() || ( $screen->is_network && current_user_can('manage_network_plugins') ) ) {
                         if ( apply_filters( 'show_advanced_plugins', true, 'mustuse' ) )
                                 $plugins['mustuse'] = get_mu_plugins();
@@ -86 +88 @@
                 foreach ( (array) $plugins['all'] as $plugin_file => $plugin_data ) {
                         // Filter into individual sections
-                        if ( is_plugin_active_for_network($plugin_file) && !$this->screen->is_network ) {
+                        if ( is_plugin_active_for_network($plugin_file) && !$screen->is_network ) {
                                 unset( $plugins['all'][ $plugin_file ] );
                                 continue;
                         } elseif ( is_multisite() && is_network_only_plugin( $plugin_file ) && !current_user_can( 'manage_network_plugins' ) ) {
                                 $plugins['network'][ $plugin_file ] = $plugin_data;
-                        } elseif ( ( !$this->screen->is_network && is_plugin_active( $plugin_file ) )
-                                || ( $this->screen->is_network && is_plugin_active_for_network( $plugin_file ) ) ) {
+                        } elseif ( ( !$screen->is_network && is_plugin_active( $plugin_file ) )
+                                || ( $screen->is_network && is_plugin_active_for_network( $plugin_file ) ) ) {
                                 $plugins['active'][ $plugin_file ] = $plugin_data;
                         } else {
-                                if ( !$this->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;
@@ -129 +131 @@
                 }
 
-                $plugins_per_page = $this->get_items_per_page( str_replace( '-', '_', "{$this->screen->id}_per_page" ) );
+                $plugins_per_page = $this->get_items_per_page( str_replace( '-', '_', $screen->id . '_per_page' ) );
 
                 $start = ( $page - 1 ) * $plugins_per_page;
@@ -254 +256 @@
                 $actions = array();
 
+                $screen = get_current_screen();
+
                 if ( 'active' != $status ) {
-                        $action = $this->screen->is_network ? 'network-activate-selected' : 'activate-selected'; 
+                        $action = $screen->is_network ? 'network-activate-selected' : 'activate-selected'; 
                         $actions[ $action ] = __( 'Activate' );
                 }
@@ -262 +266 @@
                         $actions['deactivate-selected'] = __( 'Deactivate' );
 
-                if ( !is_multisite() || $this->screen->is_network ) {
+                if ( !is_multisite() || $screen->is_network ) {
                         if ( current_user_can( 'update_plugins' ) )
                                 $actions['update-selected'] = __( 'Update' );
@@ -302 +306 @@
 
                 $context = $status;
+
+                $screen = get_current_screen();
 
                 foreach ( $this->items as $plugin_file => $plugin_data ) {
@@ -314 +320 @@
 
                         if ( 'mustuse' == $context ) {
-                                if ( is_multisite() && !$this->screen->is_network )
+                                if ( is_multisite() && !$screen->is_network )
                                         continue;
                                 $is_active = true;
                         } elseif ( 'dropins' == $context ) {
-                                if ( is_multisite() && !$this->screen->is_network )
+                                if ( is_multisite() && !$screen->is_network )
                                         continue;
                                 $dropins = _get_dropins();
@@ -338 +344 @@
                         } else {
                                 $is_active_for_network = is_plugin_active_for_network($plugin_file);
-                                if ( $this->screen->is_network )
+                                if ( $screen->is_network )
                                         $is_active = $is_active_for_network;
                                 else
                                         $is_active = is_plugin_active( $plugin_file );
 
-                                if ( $is_active_for_network && !is_super_admin() && !$this->screen->is_network )
+                                if ( $is_active_for_network && !is_super_admin() && !$screen->is_network )
                                         continue;
 
-                                if ( $this->screen->is_network ) {
+                                if ( $screen->is_network ) {
                                         if ( $is_active_for_network ) {
                                                 if ( current_user_can( 'manage_network_plugins' ) )
@@ -360 +366 @@
                                                 $actions['deactivate'] = '<a href="' . wp_nonce_url('plugins.php?action=deactivate&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'deactivate-plugin_' . $plugin_file) . '" title="' . __('Deactivate this plugin') . '">' . __('Deactivate') . '</a>';
                                         } else {
-                                                if ( is_network_only_plugin( $plugin_file ) && !$this->screen->is_network )
+                                                if ( is_network_only_plugin( $plugin_file ) && !$screen->is_network )
                                                         continue;
 
@@ -368 +374 @@
                                                         $actions['delete'] = '<a href="' . wp_nonce_url('plugins.php?action=delete-selected&amp;checked[]=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'bulk-plugins') . '" title="' . __('Delete this plugin') . '" class="delete">' . __('Delete') . '</a>';
                                         } // end if $is_active
-                                 } // end if $this->screen->is_network
+                                 } // end if $screen->is_network
 
                                 if ( current_user_can('edit_plugins') && is_writable(WP_PLUGIN_DIR . '/' . $plugin_file) )