Changeset 19132

Timestamp:

11/03/2011 11:00:46 PM (13 years ago)

Author:

nacin

Message:

Allow is_network and is_user to work for all screen instances. see #18785.

Location:

trunk/wp-admin

Files:

• admin-ajax.php (modified) (1 diff)
• includes/screen.php (modified) (5 diffs)

trunk/wp-admin/admin-ajax.php

@@ -56 +56 @@
     check_ajax_referer( "fetch-list-$list_class", '_ajax_fetch_list_nonce' );
 
-    $current_screen = (object) $_GET['list_args']['screen'];
-    //TODO fix this in a better way see #15336
-    $current_screen->is_network = 'false' === $current_screen->is_network ? false : true;
-    $current_screen->is_user = 'false' === $current_screen->is_user ? false : true;
+    $current_screen = convert_to_screen( $_GET['list_args']['screen']['id'] );
 
     define( 'WP_NETWORK_ADMIN', $current_screen->is_network );

trunk/wp-admin/includes/screen.php

@@ -401 +401 @@
 
         $action = $post_type = $taxonomy = '';
+        $is_network = $is_user = false;
 
         if ( $hook_name )
@@ -413 +414 @@
 
         if ( $hook_name ) {
-            if ( '-network' == substr( $id, -8 ) )
+            if ( '-network' == substr( $id, -8 ) ) {
                 $id = str_replace( '-network', '', $id );
-            elseif ( '-user' == substr( $id, -5 ) )
+                $is_network = true;
+            } elseif ( '-user' == substr( $id, -5 ) ) {
                 $id = str_replace( '-user', '', $id );
+                $is_user = true;
+            }
 
             $id = sanitize_key( $id );
@@ -432 +436 @@
                 }
             }
+        } else {
+            $is_network = is_network_admin();
+            $is_user = is_user_admin();
         }
 
@@ -486 +493 @@
         }
 
-        if ( is_network_admin() ) {
+        if ( $is_network ) {
             $id   .= '-network';
             $base .= '-network';
-        } elseif ( is_user_admin() ) {
+        } elseif ( $is_user ) {
             $id   .= '-user';
             $base .= '-user';
@@ -507 +514 @@
         $screen->post_type  = $post_type;
         $screen->taxonomy   = $taxonomy;
-        $screen->is_user    = is_user_admin();
-        $screen->is_network = is_network_admin();
+        $screen->is_user    = $is_user;
+        $screen->is_network = $is_network;
 
         self::$_registry[ $id ] = $screen;