Ticket #9422: 9422.diff

Users/denis/Sites/wp/wp-includes/post.php

@@ -1159 +1159 @@
         foreach ( $revision_ids as $revision_id )
                 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->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 ));
 
+        $wpdb->query( $wpdb->prepare( "DELETE FROM $wpdb->posts WHERE ID = %d", $postid ));
+
         if ( 'page' == $post->post_type ) {
                 clean_page_cache($postid);
 
@@ -1179 +1181 @@
                 clean_post_cache($postid);
         }
 
-        do_action('deleted_post', $postid);
-
         return $post;
 }
 
@@ -2516 +2516 @@
         /** @todo Delete for pluggable post taxonomies too */
         wp_delete_object_term_relationships($postid, array('category', 'post_tag'));
 
-        $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 ));
 
+        $wpdb->query( $wpdb->prepare( "DELETE FROM $wpdb->posts WHERE ID = %d", $postid ));
+
         $uploadPath = wp_upload_dir();
 
         if ( ! empty($meta['thumb']) ) {

Users/denis/Sites/wp/wp-admin/includes/user.php

@@ -431 +431 @@
         // FINALLY, delete user
         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);