summaryrefslogtreecommitdiffstats
path: root/wp-includes/user.php
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2007-03-26 11:54:56 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2007-03-26 11:54:56 +0000
commit244e8f75fcb7110a9ded532d76e5bcba50bc45f6 (patch)
treeac7fc9d8204f73f12d050ccb03b9cc6e670737e5 /wp-includes/user.php
parent6b2942866a251bb84a81cb35811ee9a1d55a8d26 (diff)
downloadwordpress-mu-244e8f75fcb7110a9ded532d76e5bcba50bc45f6.tar.gz
wordpress-mu-244e8f75fcb7110a9ded532d76e5bcba50bc45f6.tar.xz
wordpress-mu-244e8f75fcb7110a9ded532d76e5bcba50bc45f6.zip
WP Merge
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@935 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/user.php')
-rw-r--r--wp-includes/user.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/wp-includes/user.php b/wp-includes/user.php
index 058fb1c..14de35a 100644
--- a/wp-includes/user.php
+++ b/wp-includes/user.php
@@ -56,8 +56,8 @@ function update_user_option( $user_id, $option_name, $newvalue, $global = false
function get_users_of_blog( $id = '' ) {
global $wpdb, $wpmuBaseTablePrefix;
if ( empty($id) )
- $id = $wpdb->blogid;
- $users = $wpdb->get_results( "SELECT user_id, user_login, user_email, meta_value FROM $wpdb->users, $wpdb->usermeta WHERE " . $wpdb->users . ".ID = " . $wpdb->usermeta . ".user_id AND meta_key = '" . $wpmuBaseTablePrefix . $id . "_capabilities' ORDER BY {$wpdb->usermeta}.user_id" );
+ $id = (int) $wpdb->blogid;
+ $users = $wpdb->get_results( "SELECT user_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 = '" . $wpmuBaseTablePrefix . $id . "_capabilities' ORDER BY {$wpdb->usermeta}.user_id" );
return $users;
}