Changeset 12697 for trunk/wp-includes/user.php

Timestamp:

01/11/2010 09:49:40 PM (14 years ago)

Author:

wpmuguru

Message:

merge in multisite login, wp-includes, See #11644

File:

• trunk/wp-includes/user.php (modified) (1 diff)

trunk/wp-includes/user.php

@@ -280 +280 @@
     if ( empty($id) )
         $id = (int) $blog_id;
-    $users = $wpdb->get_results( "SELECT user_id, user_id AS ID, user_login, display_name, user_email, meta_value FROM $wpdb->users, $wpdb->usermeta WHERE {$wpdb->users}.ID = {$wpdb->usermeta}.user_id AND meta_key = '{$wpdb->prefix}capabilities' ORDER BY {$wpdb->usermeta}.user_id" );
+        $blog_prefix = $wpdb->get_blog_prefix($id);
+    $users = $wpdb->get_results( "SELECT user_id, user_id AS ID, user_login, display_name, user_email, meta_value FROM $wpdb->users, $wpdb->usermeta WHERE {$wpdb->users}.ID = {$wpdb->usermeta}.user_id AND meta_key = '{$blog_prefix}capabilities' ORDER BY {$wpdb->usermeta}.user_id" );
     return $users;
 }