Ticket #15854: 15854.diff

wp-includes/user.php

@@ -619 +619 @@
 }
 
 /**
- * Get users for the blog.
- *
- * For setups that use the multi-blog feature. Can be used outside of the
- * multi-blog feature.
- *
- * @since 2.2.0
- * @uses get_users() for queries
- * @uses $blog_id The Blog id of the blog for those that use more than one blog
- *
- * @param int $id Blog ID.
- * @return array List of users that are part of that Blog ID
- */
-function get_users_of_blog( $id = '' ) {
-        if ( empty( $id ) )
-                $id = get_current_blog_id();
-
-        return get_users( array( 'blog_id' => $id ) );
-}
-
-/**
  * Get the blogs a user belongs to.
  *
  * @since 3.0.0

wp-includes/deprecated.php

@@ -2416 +2416 @@
 }
 
 /**
+ * Get users for the blog.
+ *
+ * For setups that use the multi-blog feature. Can be used outside of the
+ * multi-blog feature.
+ *
+ * @since 2.2.0
+ * @deprecated 3.1.0
+ * @uses $wpdb WordPress database object for queries
+ * @uses $blog_id The Blog id of the blog for those that use more than one blog
+ *
+ * @param int $id Blog ID.
+ * @return array List of users that are part of that Blog ID
+ */
+function get_users_of_blog( $id = '' ) {
+        _deprecated_function( __FUNCTION__, '3.1', 'get_users()' );
+
+        global $wpdb, $blog_id;
+        if ( empty($id) )
+                $id = (int) $blog_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;
+}
+
+/**
  * Enable/disable automatic general feed link outputting.
  *
  * @since 2.8.0

wp-admin/includes/ms.php

@@ -65 +65 @@
 
         do_action( 'delete_blog', $blog_id, $drop );
 
-        $users = get_users_of_blog( $blog_id );
+        $users = get_users( array( 'blog_id' => $blog_id, 'fields' => 'ids' ) );
 
         // Remove users from this blog.
         if ( ! empty( $users ) ) {
-                foreach ( $users as $user ) {
-                        remove_user_from_blog( $user->ID, $blog_id) ;
+                foreach ( $users as $user_id ) {
+                        remove_user_from_blog( $user_id, $blog_id) ;
                 }
         }
 

wp-admin/network/edit.php

@@ -52 +52 @@
                                 <br /><fieldset><p><legend><?php printf( __( "What should be done with posts and links owned by <em>%s</em>?" ), $delete_user->user_login ); ?></legend></p>
                                 <?php
                                 foreach ( (array) $blogs as $key => $details ) {
-                                        $blog_users = get_users_of_blog( $details->userblog_id );
+                                        $blog_users = get_users( array( 'blog_id' => $details->userblog_id ) );
                                         if ( is_array( $blog_users ) && !empty( $blog_users ) ) {
                                                 $user_site = "<a href='" . esc_url( get_home_url( $details->userblog_id ) ) . "'>{$details->blogname}</a>";
                                                 $user_dropdown = "<select name='blog[$val][{$key}]'>";