Changeset 20581

Timestamp:

04/24/2012 10:13:47 PM (13 years ago)

Author:

ryan

Message:

• Return empty arrays instead of false for all conditions in get_blogs_of_user().
• When deleting a user, use a delete_metadata_by_mid() loop over the meta so that the meta cache is cleared.
• Use remove_user_from_blog() for DRYness.

Props nacin, duck_
Fixes #19500

Location:

trunk

Files:

• wp-admin/includes/ms.php (modified) (1 diff)
• wp-admin/includes/user.php (modified) (1 diff)
• wp-includes/user.php (modified) (3 diffs)

trunk/wp-admin/includes/ms.php

@@ -161 +161 @@
     }
 
-    $wpdb->delete( $wpdb->users, array( 'ID' => $id ) );
+    $meta = $wpdb->get_col( $wpdb->prepare( "SELECT umeta_id FROM $wpdb->usermeta WHERE user_id = %d", $id ) );
+    foreach ( $meta as $mid )
+        delete_metadata_by_mid( 'user', $mid );
+
     $wpdb->delete( $wpdb->usermeta, array( 'user_id' => $id ) );
 

trunk/wp-admin/includes/user.php

@@ -265 +265 @@
 
     // FINALLY, delete user
-    if ( !is_multisite() ) {
-        $wpdb->delete( $wpdb->usermeta, array( 'user_id' => $id ) );
+    if ( is_multisite() ) {
+        remove_user_from_blog( $id, get_current_blog_id() );
+    } else {
+        $meta = $wpdb->get_col( $wpdb->prepare( "SELECT umeta_id FROM $wpdb->usermeta WHERE user_id = %d", $id ) );
+        foreach ( $meta as $mid )
+            delete_metadata_by_mid( 'user', $mid );
+
         $wpdb->delete( $wpdb->users, array( 'ID' => $id ) );
-    } else {
-        $level_key = $wpdb->get_blog_prefix() . 'capabilities'; // wpmu site admins don't have user_levels
-        $wpdb->delete( $wpdb->usermeta, array( 'user_id' => $id , 'meta_key' => $level_key ) );
     }
 

trunk/wp-includes/user.php

@@ -653 +653 @@
  * @param int $user_id User ID
  * @param bool $all Whether to retrieve all blogs, or only blogs that are not marked as deleted, archived, or spam.
- * @return array A list of the user's blogs. False if the user was not found or an empty array if the user has no blogs.
+ * @return array A list of the user's blogs. An empty array if the user doesn't exist or belongs to no blogs.
  */
 function get_blogs_of_user( $user_id, $all = false ) {
@@ -662 +662 @@
     // Logged out users can't have blogs
     if ( empty( $user_id ) )
-        return false;
+        return array();
 
     $keys = get_user_meta( $user_id );
     if ( empty( $keys ) )
-        return false;
+        return array();
 
     if ( ! is_multisite() ) {
@@ -746 +746 @@
 
     $blogs = get_blogs_of_user( $user_id );
-    if ( is_array( $blogs ) )
-        return array_key_exists( $blog_id, $blogs );
-    else
-        return false;
+    return array_key_exists( $blog_id, $blogs );
 }