Changeset 20423

Timestamp:

04/10/2012 04:09:44 PM (13 years ago)

Author:

ryan

Message:

Pass post_type to clean_post_cache() instead of attempting to fetch a post object since the post may have been deleted.

Props leewillis77
see #19690

Location:

trunk

Files:

• wp-admin/includes/class-wp-posts-list-table.php (modified) (1 diff)
• wp-includes/comment.php (modified) (1 diff)
• wp-includes/deprecated.php (modified) (1 diff)
• wp-includes/post.php (modified) (12 diffs)

trunk/wp-admin/includes/class-wp-posts-list-table.php

@@ -361 +361 @@
                     $page->post_parent = 0;
                     $wpdb->update( $wpdb->posts, array( 'post_parent' => 0 ), array( 'ID' => $page->ID ) );
-                    clean_page_cache( $page->ID );
+                    clean_post_cache( $page->ID, $page->post_type );
                 }
 

trunk/wp-includes/comment.php

@@ -1584 +1584 @@
     $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);

trunk/wp-includes/deprecated.php

@@ -3118 +3118 @@
     return $theme_data;
 }
+
+/**
+ * Alias of update_post_cache().
+ *
+ * @see update_post_cache() Posts and pages are the same, alias is intentional
+ *
+ * @since 1.5.1
+ * @deprecated 3.4.0
+ *
+ * @param array $pages list of page objects
+ */
+function update_page_cache( &$pages ) {
+    _deprecated_function( __FUNCTION__, 3.4, 'update_post_cache()' );
+
+    update_post_cache( $pages );
+}
+
+/**
+ * Will clean the page in the cache.
+ *
+ * Clean (read: delete) page from cache that matches $id. Will also clean cache
+ * associated with 'all_page_ids' and 'get_pages'.
+ *
+ * @since 2.0.0
+ * @deprecated 3.4.0
+ *
+ * @uses do_action() Will call the 'clean_page_cache' hook action.
+ *
+ * @param int $id Page ID to clean
+ */
+function clean_page_cache( $id ) {
+    _deprecated_function( __FUNCTION__, 3.4, 'clean_post_cache()' );
+
+    clean_post_cache( $id, 'page' );
+}

trunk/wp-includes/post.php

@@ -1360 +1360 @@
 
     $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);
+    $return = $wpdb->update( $wpdb->posts, array('post_type' => $post_type), array('ID' => $post_id) );
+
+    clean_post_cache( $post_id, $post_type );
 
     return $return;
@@ -2057 +2054 @@
     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 );
     }
 
@@ -2644 +2637 @@
     $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
@@ -3536 +3526 @@
 
     // Update cache.
-    update_page_cache($pages);
+    update_post_cache( $pages );
 
     if ( $child_of || $hierarchical )
@@ -3752 +3742 @@
         update_attached_file( $post_ID, $file );
 
-    clean_post_cache($post_ID);
+    clean_post_cache( $post_ID, $post_type );
 
     if ( ! empty( $context ) )
@@ -3865 +3855 @@
         @ unlink($file);
 
-    clean_post_cache($post_id);
+    clean_post_cache( $post_id, $post->post_type );
 
     return $post;
@@ -4315 +4305 @@
  * Updates posts in cache.
  *
- * @usedby update_page_cache() Aliased by this function.
- *
  * @package WordPress
  * @subpackage Cache
@@ -4323 +4311 @@
  * @param array $posts Array of post objects
  */
-function update_post_cache(&$posts) {
-    if ( !$posts )
+function update_post_cache( &$posts ) {
+    if ( ! $posts )
         return;
 
     foreach ( $posts as $post )
-        wp_cache_add($post->ID, $post, 'posts');
+        wp_cache_add( $post->ID, $post, 'posts' );
 }
 
@@ -4349 +4337 @@
  *
  * @param int $id The Post ID in the cache to clean
- */
-function clean_post_cache($id) {
+ * @param string $post_type The post_type of the post. Defaults to "post"
+ */
+function clean_post_cache($id, $post_type = 'post') {
     global $_wp_suspend_cache_invalidation, $wpdb;
 
-    if ( !empty($_wp_suspend_cache_invalidation) )
+    if ( ! empty( $_wp_suspend_cache_invalidation ) )
         return;
 
@@ -4361 +4350 @@
         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' );
 
-    do_action('clean_post_cache', $id);
-
-    if ( $children = $wpdb->get_col( $wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_parent = %d", $id) ) ) {
+    do_action( 'clean_post_cache', $id, $post_type );
+
+    if ( 'page' == $post_type ) {
+        wp_cache_delete( 'all_page_ids', 'posts' );
+        wp_cache_delete( 'get_pages', 'posts' );
+        do_action( 'clean_page_cache', $id );
+    }
+
+    if ( $children = $wpdb->get_results( $wpdb->prepare("SELECT ID, post_type FROM $wpdb->posts WHERE post_parent = %d", $id) ) ) {
         foreach ( $children as $cid ) {
             // Loop detection
-            if ( $cid == $id )
+            if ( $cid->ID == $id )
                 continue;
-            clean_post_cache( $cid );
+            clean_post_cache( $cid->ID, $cid->post_type );
         }
     }
@@ -4383 +4376 @@
     if ( is_multisite() )
         wp_cache_delete( $wpdb->blogid . '-' . $id, 'global-posts' );
-}
-
-/**
- * Alias of update_post_cache().
- *
- * @see update_post_cache() Posts and pages are the same, alias is intentional
- *
- * @package WordPress
- * @subpackage Cache
- * @since 1.5.1
- *
- * @param array $pages list of page objects
- */
-function update_page_cache(&$pages) {
-    update_post_cache($pages);
-}
-
-/**
- * Will clean the page in the cache.
- *
- * Clean (read: delete) page from cache that matches $id. Will also clean cache
- * associated with 'all_page_ids' and 'get_pages'.
- *
- * @package WordPress
- * @subpackage Cache
- * @since 2.0.0
- *
- * @uses do_action() Will call the 'clean_page_cache' hook action.
- *
- * @param int $id Page ID to clean
- */
-function clean_page_cache($id) {
-    clean_post_cache($id);
-
-    wp_cache_delete( 'all_page_ids', 'posts' );
-    wp_cache_delete( 'get_pages', 'posts' );
-
-    do_action('clean_page_cache', $id);
 }
 
@@ -4630 +4585 @@
  */
 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);
 }