Changeset 34158 for trunk/src/wp-includes/post-functions.php

Timestamp:

09/15/2015 12:57:48 AM (10 years ago)

Author:

wonderboymusic

Message:

More bonkers comment cache cleanup: toggle wp_defer_comment_counting() in wp_insert_post() and wp_insert_attachment(). Move the cache deletion in wp_update_comment_count_now() to before the get_post() call, so that the caches get deleted even if the post has already been deleted and the function returns early.

See #33875.

File:

• trunk/src/wp-includes/post-functions.php (modified) (3 diffs)

trunk/src/wp-includes/post-functions.php

@@ -1395 +1395 @@
     $labels = array_merge( $defaults, $object->labels );
     $object->labels = (object) $object->labels;
-    
+
     return (object) $labels;
 }
@@ -2371 +2371 @@
     $wpdb->update( $wpdb->posts, $parent_data, $parent_where + array( 'post_type' => 'attachment' ) );
 
+    wp_defer_comment_counting( true );
+
     $comment_ids = $wpdb->get_col( $wpdb->prepare( "SELECT comment_ID FROM $wpdb->comments WHERE comment_post_ID = %d", $postid ));
-    foreach ( $comment_ids as $comment_id )
+    foreach ( $comment_ids as $comment_id ) {
         wp_delete_comment( $comment_id, true );
+    }
+
+    wp_defer_comment_counting( false );
 
     $post_meta_ids = $wpdb->get_col( $wpdb->prepare( "SELECT meta_id FROM $wpdb->postmeta WHERE post_id = %d ", $postid ));
@@ -4638 +4643 @@
     delete_metadata( 'post', null, '_thumbnail_id', $post_id, true );
 
+    wp_defer_comment_counting( true );
+
     $comment_ids = $wpdb->get_col( $wpdb->prepare( "SELECT comment_ID FROM $wpdb->comments WHERE comment_post_ID = %d", $post_id ));
-    foreach ( $comment_ids as $comment_id )
+    foreach ( $comment_ids as $comment_id ) {
         wp_delete_comment( $comment_id, true );
+    }
+    
+    wp_defer_comment_counting( false );
 
     $post_meta_ids = $wpdb->get_col( $wpdb->prepare( "SELECT meta_id FROM $wpdb->postmeta WHERE post_id = %d ", $post_id ));