Changeset 10975

Timestamp:

04/17/2009 02:13:00 AM (16 years ago)

Author:

ryan

Message:

Use API to delete links when deleting a user. Props TimButterfield, scohoust. fixes #7774

File:

• trunk/wp-admin/includes/user.php (modified) (3 diffs)

trunk/wp-admin/includes/user.php

@@ -412 +412 @@
 
     $id = (int) $id;
-    
+    $user = new WP_User($id);   
+
     // allow for transaction statement
     do_action('delete_user', $id);
@@ -425 +426 @@
 
         // Clean links
-        $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->links WHERE link_owner = %d", $id) );
+        $link_ids = $wpdb->get_col( $wpdb->prepare("SELECT link_id FROM $wpdb->links WHERE link_owner = %d", $id) );
+
+        if ( $link_ids ) {
+            foreach ( $link_ids as $link_id )
+                wp_delete_link($link_id);
+        }
+
     } else {
         $reassign = (int) $reassign;
@@ -436 +443 @@
     $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d", $id) );
     $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->users WHERE ID = %d", $id) );
-
-    $user = new WP_User($id);
 
     wp_cache_delete($id, 'users');