Ticket #19690: 19690.21.diff

wp-includes/comment.php

@@ -1583 +1583 @@
         $new = (int) $wpdb->get_var( $wpdb->prepare("SELECT COUNT(*) FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_approved = '1'", $post_id) );
         $wpdb->update( $wpdb->posts, array('comment_count' => $new), array('ID' => $post_id) );
 
-        if ( 'page' == $post->post_type )
-                clean_page_cache( $post_id );
-        else
-                clean_post_cache( $post_id );
+        clean_post_cache( $post_id, $post->post_type );
 
         do_action('wp_update_comment_count', $post_id, $new, $old);
         do_action('edit_post', $post_id, $post);

wp-includes/post.php

@@ -1361 +1361 @@
         $post_type = sanitize_post_field('post_type', $post_type, $post_id, 'db');
         $return = $wpdb->update($wpdb->posts, array('post_type' => $post_type), array('ID' => $post_id) );
 
-        if ( 'page' == $post_type )
-                clean_page_cache($post_id);
-        else
-                clean_post_cache($post_id);
+        clean_post_cache($post_id, $post_type);
 
         return $return;
 }
@@ -2056 +2053 @@
         $wpdb->delete( $wpdb->posts, array( 'ID' => $postid ) );
         do_action( 'deleted_post', $postid );
 
-        if ( 'page' == $post->post_type ) {
-                clean_page_cache($postid);
-        } else {
-                clean_post_cache($postid);
-        }
+        clean_post_cache($postid, $post->post_type);
 
         if ( is_post_type_hierarchical( $post->post_type ) ) {
                 foreach ( (array) $children as $child )
-                        clean_post_cache( $child->ID );
+                        clean_post_cache( $child->ID, $child->post_type );
         }
 
         wp_clear_scheduled_hook('publish_future_post', array( $postid ) );
@@ -2643 +2636 @@
 
         $current_guid = get_post_field( 'guid', $post_ID );
 
-        if ( 'page' == $data['post_type'] )
-                clean_page_cache($post_ID);
-        else
-                clean_post_cache($post_ID);
+        clean_post_cache($post_ID, $data['post_type']);
 
         // Set GUID
         if ( !$update && '' == $current_guid )
@@ -3751 +3741 @@
         if ( $file )
                 update_attached_file( $post_ID, $file );
 
-        clean_post_cache($post_ID);
+        clean_post_cache($post_ID, $post_type);
 
         if ( ! empty( $context ) )
                 add_post_meta( $post_ID, '_wp_attachment_context', $context, true );
@@ -3864 +3854 @@
         if ( ! empty($file) )
                 @ unlink($file);
 
-        clean_post_cache($post_id);
+        clean_post_cache($post_id, $post->post_type);
 
         return $post;
 }
@@ -4348 +4338 @@
  * @uses do_action() Calls 'clean_post_cache' on $id before adding children (if any).
  *
  * @param int $id The Post ID in the cache to clean
+ * @param string $post_type The post_type of the post. Defaults to "post"
  */
-function clean_post_cache($id) {
+function clean_post_cache($id, $post_type = 'post') {
         global $_wp_suspend_cache_invalidation, $wpdb;
 
         if ( !empty($_wp_suspend_cache_invalidation) )
@@ -4360 +4351 @@
         if ( 0 === $id )
                 return;
 
-        $post = get_post( $id );
-
         wp_cache_delete($id, 'posts');
         wp_cache_delete($id, 'post_meta');
 
-        clean_object_term_cache( $id, $post->post_type );
+        clean_object_term_cache( $id, $post_type );
 
         wp_cache_delete( 'wp_get_archives', 'general' );
 
@@ -4376 +4365 @@
                         // Loop detection
                         if ( $cid == $id )
                                 continue;
-                        clean_post_cache( $cid );
+                        clean_post_cache( $cid, $cid->post_type );
                 }
         }
 
@@ -4414 +4403 @@
  * @param int $id Page ID to clean
  */
 function clean_page_cache($id) {
-        clean_post_cache($id);
+        clean_post_cache($id, 'page');
 
         wp_cache_delete( 'all_page_ids', 'posts' );
         wp_cache_delete( 'get_pages', 'posts' );
@@ -4629 +4618 @@
  * @param object $post Object type containing the post information
  */
 function _save_post_hook($post_id, $post) {
-        if ( $post->post_type == 'page' ) {
-                clean_page_cache($post_id);
-        } else {
-                clean_post_cache($post_id);
-        }
+        clean_post_cache($post_id, $post->post_type);
 }
 
 /**
@@ -5361 +5346 @@
 
                 update_post_caches( $fresh_posts, 'any', $update_term_cache, $update_meta_cache );
         }
-}
- No newline at end of file
+}