Changeset 12766

Timestamp:

01/19/2010 07:23:11 PM (15 years ago)

Author:

ryan

Message:

Introduce clean_user_cache(). fixes #11761

Location:

trunk

Files:

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

trunk/wp-admin/includes/ms.php

@@ -102 +102 @@
 }
 
+// @todo Merge with wp_delete_user() ?
 function wpmu_delete_user($id) {
     global $wpdb;
@@ -132 +133 @@
     $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d", $id) );
 
-    wp_cache_delete($id, 'users');
-    wp_cache_delete($user->user_login, 'userlogins');
+    clean_user_cache($id);  
+
+    // allow for commit transaction
+    do_action('deleted_user', $id);
 
     return true;
@@ -450 +453 @@
         return false;
 
-    wp_cache_delete($id, 'users');
-    wp_cache_delete($user->user_login, 'userlogins');
+    clean_user_cache($id);
+
     return $id;
 }

trunk/wp-admin/includes/user.php

@@ -420 +420 @@
  * @return bool True when finished.
  */
-function wp_delete_user($id, $reassign = 'novalue') {
+function wp_delete_user( $id, $reassign = 'novalue' ) {
     global $wpdb;
 
@@ -429 +429 @@
     do_action('delete_user', $id);
 
-    if ($reassign == 'novalue') {
+    if ( 'novalue' === $reassign || null === $reassign ) {
         $post_ids = $wpdb->get_col( $wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_author = %d", $id) );
 
-        if ($post_ids) {
-            foreach ($post_ids as $post_id)
+        if ( $post_ids ) {
+            foreach ( $post_ids as $post_id )
                 wp_delete_post($post_id);
         }
@@ -444 +444 @@
                 wp_delete_link($link_id);
         }
-
     } else {
         $reassign = (int) $reassign;
@@ -460 +459 @@
     }
 
-    wp_cache_delete($id, 'users');
-    wp_cache_delete($user->user_login, 'userlogins');
-    wp_cache_delete($user->user_email, 'useremail');
-    wp_cache_delete($user->user_nicename, 'userslugs');
+    clean_user_cache($id);
 
     // allow for commit transaction

trunk/wp-includes/user.php

@@ -736 +736 @@
 }
 
+/**
+ * Clean all user caches
+ *
+ * @since 3.0
+ *
+ * @param int $id User ID
+ * @return void
+ */
+function clean_user_cache($id) {
+    $user = new WP_User($id);
+
+    wp_cache_delete($id, 'users');
+    wp_cache_delete($user->user_login, 'userlogins');
+    wp_cache_delete($user->user_email, 'useremail');
+    wp_cache_delete($user->user_nicename, 'userslugs');
+}
+
 ?>