WP Merge to rev 4854

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@876 7be80a69-a1ef-0310-a953-fb0f7c49ff36

2 files changed, 10 insertions, 8 deletions

diff --git a/wp-includes/user.php b/wp-includes/user.php
index 4d202a6..00b58d2 100644
--- a/wp-includes/user.php
+++ b/wp-includes/user.php
@@ -50,6 +50,16 @@ function update_user_option( $user_id, $option_name, $newvalue, $global = false
 	return update_usermeta( $user_id, $option_name, $newvalue );
 }
 
+// Get users with capabilities for the current blog.
+// For setups that use the multi-blog feature.
+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" );
+	return $users;
+}
+
 //
 // User meta functions
 //
diff --git a/wp-includes/wpmu-functions.php b/wp-includes/wpmu-functions.php
index 306d580..d81c36d 100644
--- a/wp-includes/wpmu-functions.php
+++ b/wp-includes/wpmu-functions.php
@@ -409,14 +409,6 @@ function restore_current_blog() {
 	$switched = 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" );
-	return $users;
-}
-
 function get_blogs_of_user( $id, $all = false ) {
 	global $wpdb, $wpmuBaseTablePrefix;