Changeset 5666 for trunk/wp-includes/comment.php

Timestamp:

06/08/2007 12:20:22 AM (18 years ago)

Author:

ryan

Message:

Comment caching. Reduce queries on edit-comments.php page. Add non-persistent cache groups. Hat tip to hovenko. fixes #4387

File:

• trunk/wp-includes/comment.php (modified) (7 diffs)

trunk/wp-includes/comment.php

@@ -72 +72 @@
 // Handles comment caching.
 function &get_comment(&$comment, $output = OBJECT) {
-    global $comment_cache, $wpdb;
+    global $wpdb;
 
     if ( empty($comment) ) {
@@ -80 +80 @@
             $_comment = null;
     } elseif ( is_object($comment) ) {
-        if ( !isset($comment_cache[$comment->comment_ID]) )
-            $comment_cache[$comment->comment_ID] = &$comment;
-        $_comment = & $comment_cache[$comment->comment_ID];
+        wp_cache_add($comment->comment_ID, $comment, 'comment');
+        $_comment = $comment;
     } else {
         $comment = (int) $comment;
         if ( isset($GLOBALS['comment']) && ($GLOBALS['comment']->comment_ID == $comment) ) {
             $_comment = & $GLOBALS['comment'];
-        } elseif ( !isset($comment_cache[$comment]) ) {
+        } elseif ( ! $_comment = wp_cache_get($comment, 'comment') ) {
             $_comment = $wpdb->get_row("SELECT * FROM $wpdb->comments WHERE comment_ID = '$comment' LIMIT 1");
-            $comment_cache[$comment->comment_ID] = & $_comment;
-        } else {
-            $_comment = & $comment_cache[$comment];
-        }
-    }
+            wp_cache_add($_comment->comment_ID, $_comment, 'comment');
+        }
+    }
+
+    $_comment = apply_filters('get_comment', $_comment);
 
     if ( $output == OBJECT ) {
@@ -286 +285 @@
         wp_update_comment_count($post_id);
 
+    clean_comment_cache($comment_id);
+
     do_action('wp_set_comment_status', $comment_id, 'delete');
     return true;
@@ -294 +295 @@
     global $wpdb;
 
-    $result = $wpdb->get_var("SELECT comment_approved FROM $wpdb->comments WHERE comment_ID='$comment_id' LIMIT 1");
-
-    if ( $result == NULL )
+    $comment = get_comment($comment_id);
+    if ( !$comment )
+        return false;
+
+    $approved = $comment->comment_approved;
+
+    if ( $approved == NULL )
         return 'deleted';
-    elseif ( $result == '1' )
+    elseif ( $approved == '1' )
         return 'approved';
-    elseif ( $result == '0' )
+    elseif ( $approved == '0' )
         return 'unapproved';
-    elseif ( $result == 'spam' )
+    elseif ( $approved == 'spam' )
         return 'spam';
     else
@@ -439 +444 @@
         return false;
 
+    clean_comment_cache($comment_id);
+
     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;
 }
@@ -480 +488 @@
 
     $rval = $wpdb->rows_affected;
+
+    clean_comment_cache($comment_ID);
     wp_update_comment_count($comment_post_ID);
     do_action('edit_comment', $comment_ID);
@@ -794 +804 @@
 }
 
+//
+// Cache
+//
+
+function clean_comment_cache($id) {
+    wp_cache_delete($id, 'comment');
+}
+
+function update_comment_cache($comments) {
+    foreach ( $comments as $comment )
+        wp_cache_add($comment->comment_ID, $comment, 'comment');
+}
+
 ?>