Changeset 17084

Timestamp:

12/20/2010 04:25:35 PM (14 years ago)

Author:

ryan

Message:

Revert get_users_of_blog() to 3.0 behavior and deprecate. Use get_users() in core. Props scribu. fixes #15854

Location:

trunk

Files:

• wp-admin/includes/ms.php (modified) (1 diff)
• wp-admin/network/edit.php (modified) (1 diff)
• wp-includes/deprecated.php (modified) (1 diff)
• wp-includes/user.php (modified) (1 diff)

trunk/wp-admin/includes/ms.php

@@ -66 +66 @@
     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) ;
         }
     }

trunk/wp-admin/network/edit.php

@@ -53 +53 @@
                 <?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>";

trunk/wp-includes/deprecated.php

@@ -2417 +2417 @@
 
 /**
+ * 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.
  *

trunk/wp-includes/user.php

@@ -620 +620 @@
 
 /**
- * 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.
  *