Ticket #19080: 19080.patch

wp-admin/includes/screen.php

@@ -498 +498 @@
                         $base .= '-user';
                 }
 
-                if ( isset( self::$_registry[ $id ] ) )
-                        return self::$_registry[ $id ];
+                $key = ( $base !== $id ) ? $base . '-' . $id : $id;
 
+                if ( isset( self::$_registry[ $key ] ) )
+                        return self::$_registry[ $key ];
+
                 $screen = new WP_Screen();
                 $screen->id         = $id;
                 $screen->base       = $base;
@@ -510 +512 @@
                 $screen->is_user    = is_user_admin();
                 $screen->is_network = is_network_admin();
 
-                self::$_registry[ $id ] = $screen;
+                self::$_registry[ $key ] = $screen;
 
                 return $screen;
         }