Changeset 3104

Timestamp:

11/16/2005 06:29:36 AM (19 years ago)

Author:

ryan

Message:

Add comment_count to the posts table. Props donncha. fixes #1860

Location:

trunk

Files:

• wp-admin/list-manipulation.php (modified) (1 diff)
• wp-admin/upgrade-functions.php (modified) (2 diffs)
• wp-admin/upgrade-schema.php (modified) (1 diff)
• wp-includes/comment-functions.php (modified) (5 diffs)
• wp-includes/functions.php (modified) (1 diff)
• wp-includes/version.php (modified) (1 diff)

trunk/wp-admin/list-manipulation.php

@@ -57 +57 @@
         die('-1');
 
-    if ( wp_set_comment_status($comment->comment_ID, "delete") ) {
-        do_action('delete_comment', $comment->comment_ID);
+    if ( wp_delete_comment($comment->comment_ID) ) {
         die('1');
     } else {

trunk/wp-admin/upgrade-functions.php

@@ -31 +31 @@
     }
     
-    if ( $wp_current_db_version < 3092 )
+    if ( $wp_current_db_version < 3104 )
         upgrade_160();
 
@@ -301 +301 @@
         }
     }
-    
+
+    // populate comment_count field of posts table
+    $comments = $wpdb->get_results( "SELECT comment_post_ID, COUNT(*) as c FROM $wpdb->comments GROUP BY comment_post_ID" );
+    if( is_array( $comments ) ) {
+        foreach ($comments as $comment) {
+            $wpdb->query( "UPDATE $wpdb->posts SET comment_count = $comment->c WHERE ID = '$comment->comment_post_ID}'" );
+        }
+    }
+
     // Some alpha versions used a post status of object instead of attachment and put
     // the mime type in post_type instead of post_mime_type.

trunk/wp-admin/upgrade-schema.php

@@ -122 +122 @@
   post_type varchar(100) NOT NULL,
   post_mime_type varchar(100) NOT NULL,
+  comment_count bigint(20) NOT NULL default '0',
   PRIMARY KEY  (ID),
   KEY post_name (post_name)

trunk/wp-includes/comment-functions.php

@@ -82 +82 @@
     ");
 
-    return $wpdb->insert_id;
+    $id = $wpdb->insert_id;
+
+    if ( $comment_approved == 1)
+        $wpdb->query( "UPDATE $wpdb->posts SET comment_count = comment_count + 1 WHERE ID = '$comment_post_ID'" );
+    
+    return $id;
 }
 
@@ -177 +182 @@
     $rval = $wpdb->rows_affected;
 
+    $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'" );
+
     do_action('edit_comment', $comment_ID);
 
-    return $rval;   
+    return $rval;
+}
+
+function wp_delete_comment($comment_id) {
+    global $wpdb;
+    do_action('delete_comment', $comment_id);
+
+    $comment = get_comment($comment_id);
+
+    if ( ! $wpdb->query("DELETE FROM $wpdb->comments WHERE comment_ID='$comment_id' LIMIT 1") )
+        return false;
+
+    $post_id = $comment->comment_post_ID;
+    if ( $post_id )
+        $wpdb->query( "UPDATE $wpdb->posts SET comment_count = comment_count - 1 WHERE ID = '$post_id'" );
+
+    do_action('wp_set_comment_status', $comment_id, 'delete');
+    return true;
 }
 
@@ -199 +225 @@
 
     if ( !isset($comment_count_cache[$post_id]) )
-        $comment_count_cache[$post_id] =  $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->comments WHERE comment_post_ID = '$post_id' AND comment_approved = '1'");
+        $comment_count_cache[$id] = $wpdb->get_var("SELECT comment_count FROM $wpdb->posts WHERE ID = '$post_id'");
     
     return apply_filters('get_comments_number', $comment_count_cache[$post_id]);
@@ -743 +769 @@
         break;
         case 'delete':
-            $query = "DELETE FROM $wpdb->comments WHERE comment_ID='$comment_id' LIMIT 1";
+            return wp_delete_comment($comment_id);
         break;
         default:
@@ -751 +777 @@
     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 {

trunk/wp-includes/functions.php

@@ -1307 +1307 @@
 
     // Do the same for comment numbers
-    $comment_counts = $wpdb->get_results("SELECT comment_post_ID, COUNT( comment_ID ) AS ccount
-    FROM $wpdb->comments
-    WHERE comment_post_ID IN ($post_id_list)
-    AND comment_approved = '1'
-    GROUP BY comment_post_ID");
+    $comment_counts = $wpdb->get_results( "SELECT ID as comment_post_ID, comment_count as ccount FROM $wpdb->posts WHERE ID in ($post_id_list)" );
 
     if ( $comment_counts ) {

trunk/wp-includes/version.php

@@ -4 +4 @@
 
 $wp_version = '1.6-ALPHA-2-still-dont-use';
-$wp_db_version = 3092;
+$wp_db_version = 3104;
 
 ?>