Changeset 10851

Timestamp:

03/31/2009 07:16:53 PM (15 years ago)

Author:

ryan

Message:

Fix delete statements to ensure data integrity when innodb and foreign keys are used. Props Denis-de-Bernardy. see #9422

Location:

trunk

Files:

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

trunk/wp-admin/includes/user.php

@@ -432 +432 @@
     do_action('delete_user', $id);
 
+    $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) );
-    $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d", $id) );
 
     $user = new WP_User($id);

trunk/wp-includes/post.php

@@ -1160 +1160 @@
         wp_delete_post_revision( $revision_id );
 
+    do_action('deleted_post', $postid);
+
     // Point all attachments to this post up one level
     $wpdb->update( $wpdb->posts, $parent_data, $parent_where + array( 'post_type' => 'attachment' ) );
 
+    $wpdb->query( $wpdb->prepare( "DELETE FROM $wpdb->comments WHERE comment_post_ID = %d", $postid ));
+
+    $wpdb->query( $wpdb->prepare( "DELETE FROM $wpdb->postmeta WHERE post_id = %d", $postid ));
+
     $wpdb->query( $wpdb->prepare( "DELETE FROM $wpdb->posts WHERE ID = %d", $postid ));
-
-    $wpdb->query( $wpdb->prepare( "DELETE FROM $wpdb->comments WHERE comment_post_ID = %d", $postid ));
-
-    $wpdb->query( $wpdb->prepare( "DELETE FROM $wpdb->postmeta WHERE post_id = %d", $postid ));
 
     if ( 'page' == $post->post_type ) {
@@ -1179 +1181 @@
         clean_post_cache($postid);
     }
-
-    do_action('deleted_post', $postid);
 
     return $post;
@@ -2517 +2517 @@
     wp_delete_object_term_relationships($postid, array('category', 'post_tag'));
 
+    $wpdb->query( $wpdb->prepare( "DELETE FROM $wpdb->comments WHERE comment_post_ID = %d", $postid ));
+
+    $wpdb->query( $wpdb->prepare( "DELETE FROM $wpdb->postmeta WHERE post_id = %d ", $postid ));
+
     $wpdb->query( $wpdb->prepare( "DELETE FROM $wpdb->posts WHERE ID = %d", $postid ));
-
-    $wpdb->query( $wpdb->prepare( "DELETE FROM $wpdb->comments WHERE comment_post_ID = %d", $postid ));
-
-    $wpdb->query( $wpdb->prepare( "DELETE FROM $wpdb->postmeta WHERE post_id = %d ", $postid ));
 
     $uploadPath = wp_upload_dir();