Changeset 4631

Timestamp:

12/08/2006 07:35:45 AM (18 years ago)

Author:

ryan

Message:

Some caching cleanups.

Location:

trunk

Files:

• wp-admin/admin-db.php (modified) (3 diffs)
• wp-includes/comment.php (modified) (2 diffs)
• wp-includes/functions.php (modified) (4 diffs)
• wp-includes/post.php (modified) (4 diffs)

trunk/wp-admin/admin-db.php

@@ -134 +134 @@
     }
 
-    wp_cache_delete($cat_ID, 'category');
-    wp_cache_delete('get_categories', 'category');
+    clean_category_cache($cat_ID);
 
     if ($update) {
         do_action('edit_category', $cat_ID);
     } else {
-        wp_cache_delete('all_category_ids', 'category');
         do_action('create_category', $cat_ID);
         do_action('add_category', $cat_ID);
@@ -214 +212 @@
     }
 
-    wp_cache_delete($cat_ID, 'category');
-    wp_cache_delete('all_category_ids', 'category');
-    wp_cache_delete('get_categories', 'category');
+    clean_category_cache($cat_ID);
 
     do_action('delete_category', $cat_ID);
@@ -488 +484 @@
     }
 
-    do_action('edit_link', $link_ID);
 }   // wp_set_link_cats()
 

trunk/wp-includes/comment.php

@@ -431 +431 @@
     }
 
-    if ( $wpdb->query($query) ) {
-        do_action('wp_set_comment_status', $comment_id, $comment_status);
-
-        $comment = get_comment($comment_id);
-        $comment_post_ID = $comment->comment_post_ID;
-        $c = $wpdb->get_row("SELECT count(*) as c FROM {$wpdb->comments} WHERE comment_post_ID = '$comment_post_ID' AND comment_approved = '1'");
-        if ( is_object($c) )
-            $wpdb->query("UPDATE $wpdb->posts SET comment_count = '$c->c' WHERE ID = '$comment_post_ID'");
-        return true;
-    } else {
+    if ( !$wpdb->query($query) )
         return false;
-    }
+
+    do_action('wp_set_comment_status', $comment_id, $comment_status);
+    $comment = get_comment($comment_id);
+    wp_update_comment_count($comment->comment_post_ID);
+    return true;
 }
 
@@ -491 +486 @@
     $wpdb->query("UPDATE $wpdb->posts SET comment_count = $count WHERE ID = '$post_id'");
     $comment_count_cache[$post_id] = $count;
+
+    $post = get_post($post_id);
+    if ( 'page' == $post->post_type )
+        clean_page_cache( $post_id );
+    else
+        clean_post_cache( $post_id );
+
+    do_action('edit_post', $post_id);
+
     return true;
 }

trunk/wp-includes/functions.php

@@ -520 +520 @@
 
 function clean_post_cache($id) {
-    global $post_cache, $blog_id;
+    global $post_cache, $post_meta_cache, $category_cache, $blog_id;
 
     if ( isset( $post_cache[$blog_id][$id] ) )
         unset( $post_cache[$blog_id][$id] );
+
+    if ( isset ($post_meta_cache[$blog_id][$id] ) )
+        unset( $post_meta_cache[$blog_id][$id] );
+
+    if ( isset( $category_cache[$blog_id][$id]) )
+        unset ( $category_cache[$blog_id][$id] );
 }
 
@@ -538 +544 @@
 }
 
-
 function clean_page_cache($id) {
     global $page_cache, $blog_id;
@@ -544 +549 @@
     if ( isset( $page_cache[$blog_id][$id] ) )
         unset( $page_cache[$blog_id][$id] );
+
+    wp_cache_delete($id, 'pages');
+    wp_cache_delete( 'all_page_ids', 'pages' );
+    wp_cache_delete( 'get_pages', 'page' );
 }
 
@@ -648 +657 @@
 function update_category_cache() {
     return true;
+}
+
+function clean_category_cache($id) {
+    wp_cache_delete($id, 'category');
+    wp_cache_delete('all_category_ids', 'category');
+    wp_cache_delete('get_categories', 'category');
 }
 

trunk/wp-includes/post.php

@@ -439 +439 @@
 
     if ( 'page' == $post->post_type ) {
-        wp_cache_delete( 'all_page_ids', 'pages' );
-        wp_cache_delete( 'get_pages', 'page' );
+        clean_page_cache($postid);
         $wp_rewrite->flush_rules();
     }
@@ -651 +650 @@
     if ( 'page' == $post_type ) {
         clean_page_cache($post_ID);
-        wp_cache_delete($post_ID, 'pages');
+        $wp_rewrite->flush_rules();
     } else {
         clean_post_cache($post_ID);
@@ -690 +689 @@
         }
     } else if ($post_type == 'page') {
-        wp_cache_delete( 'all_page_ids', 'pages' );
-        wp_cache_delete( 'get_pages', 'page' );
-        $wp_rewrite->flush_rules();
-
         if ( !empty($page_template) )
             if ( ! update_post_meta($post_ID, '_wp_page_template',  $page_template))
@@ -817 +812 @@
         $count = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->post2cat, $wpdb->posts WHERE $wpdb->posts.ID=$wpdb->post2cat.post_id AND post_status = 'publish' AND post_type = 'post' AND category_id = '$cat_id'");
         $wpdb->query("UPDATE $wpdb->categories SET category_count = '$count' WHERE cat_ID = '$cat_id'");
-        wp_cache_delete($cat_id, 'category');
+        clean_category_cache($cat_id);
         do_action('edit_category', $cat_id);
     }
-
-    wp_cache_delete('get_categories', 'category');
-
-    do_action('edit_post', $post_ID);
 }   // wp_set_post_categories()