Changeset 20522 for trunk/wp-admin/includes/ms.php

Timestamp:

04/18/2012 09:07:31 PM (12 years ago)

Author:

duck_

Message:

Pass full user objects to clean_user_cache(). See #19500, fixes #20460.

Prevents notices when clean_user_cache() is called for a user that has been removed from the database.

File:

• trunk/wp-admin/includes/ms.php (modified) (4 diffs)

trunk/wp-admin/includes/ms.php

@@ -133 +133 @@
 
     $id = (int) $id;
+    $user = new WP_User( $id );
 
     do_action( 'wpmu_delete_user', $id );
@@ -163 +164 @@
     $wpdb->delete( $wpdb->usermeta, array( 'user_id' => $id ) );
 
-    clean_user_cache( $id );
+    clean_user_cache( $user );
 
     // allow for commit transaction
@@ -390 +391 @@
     $wpdb->update( $wpdb->users, array( $pref => $value ), array( 'ID' => $id ) );
 
-    clean_user_cache( $id );
+    $user = new WP_User( $id );
+    clean_user_cache( $user );
 
     if ( $pref == 'spam' ) {
@@ -408 +410 @@
         return false;
 
-    clean_user_cache( $id );
+    clean_user_cache( $user );
 
     return $id;