Changeset 17080

Timestamp:

12/20/2010 01:30:39 PM (14 years ago)

Author:

ryan

Message:

Define net and user admin constants for fetch-list case. Props scribu. fixes #15903

Location:

trunk

Files:

• wp-admin/admin-ajax.php (modified) (1 diff)
• wp-includes/load.php (modified) (1 diff)

trunk/wp-admin/admin-ajax.php

@@ -57 +57 @@
     $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'] );

trunk/wp-includes/load.php

@@ -611 +611 @@
  */
 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;