From 539ad97c8bc7b85a88b8c31ce2495a523f77c228 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Sat, 9 Mar 2013 03:52:27 +0000 Subject: [PATCH] Replace deprecated WP_Screen::is_network property with WP_Screen::in_admin( 'network' ). props bpetty. fixes #23215. git-svn-id: http://core.svn.wordpress.org/trunk@23658 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- .../includes/class-wp-plugins-list-table.php | 34 +++++++++---------- wp-admin/includes/screen.php | 34 +++++++++---------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/wp-admin/includes/class-wp-plugins-list-table.php b/wp-admin/includes/class-wp-plugins-list-table.php index 64086d8d49..435b37de0b 100644 --- a/wp-admin/includes/class-wp-plugins-list-table.php +++ b/wp-admin/includes/class-wp-plugins-list-table.php @@ -53,7 +53,7 @@ class WP_Plugins_List_Table extends WP_List_Table { $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(); if ( apply_filters( 'show_advanced_plugins', true, 'dropins' ) ) @@ -72,7 +72,7 @@ class WP_Plugins_List_Table extends WP_List_Table { 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() ); foreach ( $recently_activated as $key => $time ) @@ -83,15 +83,15 @@ class WP_Plugins_List_Table extends WP_List_Table { 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; } @@ -237,12 +237,12 @@ class WP_Plugins_List_Table extends WP_List_Table { $actions = array(); 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' ); + $actions['deactivate-selected'] = $this->screen->in_admin( 'network' ) ? __( 'Network Deactivate' ) : __( 'Deactivate' ); - if ( !is_multisite() || $this->screen->is_network ) { + if ( !is_multisite() || $this->screen->in_admin( 'network' ) ) { if ( current_user_can( 'update_plugins' ) ) $actions['update-selected'] = __( 'Update' ); if ( current_user_can( 'delete_plugins' ) && ( 'active' != $status ) ) @@ -269,7 +269,7 @@ class WP_Plugins_List_Table extends WP_List_Table { echo '
'; - 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 ) echo '

' . sprintf( __( 'Files in the %s directory are executed automatically.' ), str_replace( ABSPATH, '/', WPMU_PLUGIN_DIR ) ) . '

'; @@ -289,7 +289,7 @@ class WP_Plugins_List_Table extends WP_List_Table { function display_rows() { 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; foreach ( $this->items as $plugin_file => $plugin_data ) @@ -331,12 +331,12 @@ class WP_Plugins_List_Table extends WP_List_Table { if ( $plugin_data['Description'] ) $description .= '

' . $plugin_data['Description'] . '

'; } 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' ) ) $actions['deactivate'] = '' . __('Network Deactivate') . ''; @@ -355,13 +355,13 @@ class WP_Plugins_List_Table extends WP_List_Table { if ( ! is_multisite() && current_user_can('delete_plugins') ) $actions['delete'] = '' . __('Delete') . ''; } // end if $is_active - } // end if $screen->is_network + } // end if $screen->in_admin( 'network' ) - if ( ( ! is_multisite() || $screen->is_network ) && current_user_can('edit_plugins') && is_writable(WP_PLUGIN_DIR . '/' . $plugin_file) ) + if ( ( ! is_multisite() || $screen->in_admin( 'network' ) ) && current_user_can('edit_plugins') && is_writable(WP_PLUGIN_DIR . '/' . $plugin_file) ) $actions['edit'] = '' . __('Edit') . ''; } // 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 ); diff --git a/wp-admin/includes/screen.php b/wp-admin/includes/screen.php index a2ff801930..7103c8445d 100644 --- a/wp-admin/includes/screen.php +++ b/wp-admin/includes/screen.php @@ -319,20 +319,20 @@ final class WP_Screen { /** * 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. * * @since 3.3.0 * @var string * @access private - */ + */ private $_help_sidebar = ''; /** @@ -376,16 +376,16 @@ final class WP_Screen { */ 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 = '' ) { if ( is_a( $hook_name, 'WP_Screen' ) ) @@ -427,13 +427,13 @@ final class WP_Screen { if ( 'edit-comments' != $id && 'edit-tags' != $id && 'edit-' == substr( $id, 0, 5 ) ) { $maybe = substr( $id, 5 ); if ( taxonomy_exists( $maybe ) ) { - $id = 'edit-tags'; + $id = 'edit-tags'; $taxonomy = $maybe; } elseif ( post_type_exists( $maybe ) ) { $id = 'edit'; $post_type = $maybe; } - } + } if ( ! $in_admin ) $in_admin = 'site'; @@ -480,7 +480,7 @@ final class WP_Screen { $post_type = 'post'; break; } - } + } switch ( $base ) { case 'post' : @@ -513,7 +513,7 @@ final class WP_Screen { } elseif ( 'user' == $in_admin ) { $id .= '-user'; $base .= '-user'; - } + } if ( isset( self::$_registry[ $id ] ) ) { $screen = self::$_registry[ $id ]; @@ -535,7 +535,7 @@ final class WP_Screen { self::$_registry[ $id ] = $screen; return $screen; - } + } /** * Makes the screen object the current screen.