From 65f14e4fd3a8ad84f86b45ca5a8e52fa3305f585 Mon Sep 17 00:00:00 2001 From: ryan Date: Mon, 20 Dec 2010 13:30:39 +0000 Subject: [PATCH] Define net and user admin constants for fetch-list case. Props scribu. fixes #15903 git-svn-id: http://svn.automattic.com/wordpress/trunk@17080 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/admin-ajax.php | 3 +++ wp-includes/load.php | 5 ----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/wp-admin/admin-ajax.php b/wp-admin/admin-ajax.php index b6420e22b..b79518001 100644 --- a/wp-admin/admin-ajax.php +++ b/wp-admin/admin-ajax.php @@ -57,6 +57,9 @@ case 'fetch-list' : $current_screen->is_network = 'false' === $current_screen->is_network ? false : true; $current_screen->is_user = 'false' === $current_screen->is_user ? false : true; + define( 'WP_NETWORK_ADMIN', $current_screen->is_network ); + define( 'WP_USER_ADMIN', $current_screen->is_user ); + $wp_list_table = get_list_table( $_GET['list_args']['class'] ); if ( ! $wp_list_table ) die( '0' ); diff --git a/wp-includes/load.php b/wp-includes/load.php index 96845facf..a384f1e3d 100644 --- a/wp-includes/load.php +++ b/wp-includes/load.php @@ -610,11 +610,6 @@ function is_blog_admin() { * @return bool True if inside WordPress network administration pages. */ function is_network_admin() { - if ( defined('DOING_AJAX') && function_exists('get_current_screen') ) { - $screen = get_current_screen(); - return (bool) $screen->is_network; - } - if ( defined( 'WP_NETWORK_ADMIN' ) ) return WP_NETWORK_ADMIN; return false;