Changeset 23658

Timestamp:

03/09/2013 03:52:27 AM (12 years ago)

Author:

SergeyBiryukov

Message:

Replace deprecated WP_Screen::is_network property with WP_Screen::in_admin( 'network' ). props bpetty. fixes #23215.

Location:

trunk/wp-admin/includes

Files:

• class-wp-plugins-list-table.php (modified) (8 diffs)
• screen.php (modified) (8 diffs)

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

@@ -54 +54 @@
         $screen = $this->screen;
 
-        if ( ! is_multisite() || ( $screen->is_network && current_user_can('manage_network_plugins') ) ) {
+        if ( ! is_multisite() || ( $screen->in_admin( 'network' ) && current_user_can( 'manage_network_plugins' ) ) ) {
             if ( apply_filters( 'show_advanced_plugins', true, 'mustuse' ) )
                 $plugins['mustuse'] = get_mu_plugins();
@@ -73 +73 @@
         set_transient( 'plugin_slugs', array_keys( $plugins['all'] ), DAY_IN_SECONDS );
 
-        if ( ! $screen->is_network ) {
+        if ( ! $screen->in_admin( 'network' ) ) {
             $recently_activated = get_option( 'recently_activated', array() );
 
@@ -84 +84 @@
         foreach ( (array) $plugins['all'] as $plugin_file => $plugin_data ) {
             // Filter into individual sections
-            if ( is_multisite() && ! $screen->is_network && is_network_only_plugin( $plugin_file ) ) {
+            if ( is_multisite() && ! $screen->in_admin( 'network' ) && is_network_only_plugin( $plugin_file ) ) {
                 unset( $plugins['all'][ $plugin_file ] );
-            } elseif ( ! $screen->is_network && is_plugin_active_for_network( $plugin_file ) ) {
+            } elseif ( ! $screen->in_admin( 'network' ) && is_plugin_active_for_network( $plugin_file ) ) {
                 unset( $plugins['all'][ $plugin_file ] );
-            } elseif ( ( ! $screen->is_network && is_plugin_active( $plugin_file ) )
-                || ( $screen->is_network && is_plugin_active_for_network( $plugin_file ) ) ) {
+            } elseif ( ( ! $screen->in_admin( 'network' ) && is_plugin_active( $plugin_file ) )
+                || ( $screen->in_admin( 'network' ) && is_plugin_active_for_network( $plugin_file ) ) ) {
                 $plugins['active'][ $plugin_file ] = $plugin_data;
             } else {
-                if ( ! $screen->is_network && isset( $recently_activated[ $plugin_file ] ) ) // Was the plugin recently activated?
+                if ( ! $screen->in_admin( 'network' ) && isset( $recently_activated[ $plugin_file ] ) ) // Was the plugin recently activated?
                     $plugins['recently_activated'][ $plugin_file ] = $plugin_data;
                 $plugins['inactive'][ $plugin_file ] = $plugin_data;
@@ -238 +238 @@
 
         if ( 'active' != $status )
-            $actions['activate-selected'] = $this->screen->is_network ? __( 'Network Activate' ) : __( 'Activate' );
+            $actions['activate-selected'] = $this->screen->in_admin( 'network' ) ? __( 'Network Activate' ) : __( 'Activate' );
 
         if ( 'inactive' != $status && 'recent' != $status )
-            $actions['deactivate-selected'] = $this->screen->is_network ? __( 'Network Deactivate' ) : __( 'Deactivate' );
-
-        if ( !is_multisite() || $this->screen->is_network ) {
+            $actions['deactivate-selected'] = $this->screen->in_admin( 'network' ) ? __( 'Network Deactivate' ) : __( 'Deactivate' );
+
+        if ( !is_multisite() || $this->screen->in_admin( 'network' ) ) {
             if ( current_user_can( 'update_plugins' ) )
                 $actions['update-selected'] = __( 'Update' );
@@ -270 +270 @@
         echo '<div class="alignleft actions">';
 
-        if ( ! $this->screen->is_network && 'recently_activated' == $status )
+        if ( ! $this->screen->in_admin( 'network' ) && 'recently_activated' == $status )
             submit_button( __( 'Clear List' ), 'button', 'clear-recent-list', false );
         elseif ( 'top' == $which && 'mustuse' == $status )
@@ -290 +290 @@
         global $status;
 
-        if ( is_multisite() && ! $this->screen->is_network && in_array( $status, array( 'mustuse', 'dropins' ) ) )
+        if ( is_multisite() && ! $this->screen->in_admin( 'network' ) && in_array( $status, array( 'mustuse', 'dropins' ) ) )
             return;
 
@@ -332 +332 @@
                 $description .= '<p>' . $plugin_data['Description'] . '</p>';
         } else {
-            if ( $screen->is_network )
+            if ( $screen->in_admin( 'network' ) )
                 $is_active = is_plugin_active_for_network( $plugin_file );
             else
                 $is_active = is_plugin_active( $plugin_file );
 
-            if ( $screen->is_network ) {
+            if ( $screen->in_admin( 'network' ) ) {
                 if ( $is_active ) {
                     if ( current_user_can( 'manage_network_plugins' ) )
@@ -356 +356 @@
                         $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="' . esc_attr__('Delete this plugin') . '" class="delete">' . __('Delete') . '</a>';
                 } // end if $is_active
-             } // end if $screen->is_network
-
-            if ( ( ! is_multisite() || $screen->is_network ) && current_user_can('edit_plugins') && is_writable(WP_PLUGIN_DIR . '/' . $plugin_file) )
+             } // end if $screen->in_admin( 'network' )
+
+            if ( ( ! is_multisite() || $screen->in_admin( 'network' ) ) && current_user_can('edit_plugins') && is_writable(WP_PLUGIN_DIR . '/' . $plugin_file) )
                 $actions['edit'] = '<a href="plugin-editor.php?file=' . $plugin_file . '" title="' . esc_attr__('Open this file in the Plugin Editor') . '" class="edit">' . __('Edit') . '</a>';
         } // end if $context
 
-        $prefix = $screen->is_network ? 'network_admin_' : '';
+        $prefix = $screen->in_admin( 'network' ) ? 'network_admin_' : '';
         $actions = apply_filters( $prefix . 'plugin_action_links', array_filter( $actions ), $plugin_file, $plugin_data, $context );
         $actions = apply_filters( $prefix . "plugin_action_links_$plugin_file", $actions, $plugin_file, $plugin_data, $context );

trunk/wp-admin/includes/screen.php

@@ -320 +320 @@
     /**
      * The help tab data associated with the screen, if any.
-     *
-     * @since 3.3.0
-     * @var array
-     * @access private
-     */
+     *
+     * @since 3.3.0
+     * @var array
+     * @access private
+     */
     private $_help_tabs = array();
 
-    /**
+    /**
      * The help sidebar data associated with screen, if any.
      *
@@ -333 +333 @@
      * @var string
      * @access private
-     */
+     */
     private $_help_sidebar = '';
 
@@ -377 +377 @@
     private $_screen_settings;
 
-    /**
+    /**
      * Fetches a screen object.
-     *
-     * @since 3.3.0
+     *
+     * @since 3.3.0
      * @access public
-     *
+     *
      * @param string $hook_name Optional. The hook name (also known as the hook suffix) used to determine the screen.
      *  Defaults to the current $hook_suffix global.
      * @return WP_Screen Screen object.
-     */
+     */
     public static function get( $hook_name = '' ) {
 
@@ -428 +428 @@
                 $maybe = substr( $id, 5 );
                 if ( taxonomy_exists( $maybe ) ) {
-                    $id = 'edit-tags';
+                    $id = 'edit-tags';
                     $taxonomy = $maybe;
                 } elseif ( post_type_exists( $maybe ) ) {
@@ -434 +434 @@
                     $post_type = $maybe;
                 }
-            }
+            }
 
             if ( ! $in_admin )
@@ -481 +481 @@
                     break;
             }
-        }
+        }
 
         switch ( $base ) {
@@ -514 +514 @@
             $id   .= '-user';
             $base .= '-user';
-        }
+        }
 
         if ( isset( self::$_registry[ $id ] ) ) {
@@ -536 +536 @@
 
         return $screen;
-    }
+    }
 
     /**