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

Timestamp:

11/05/2009 09:03:09 PM (17 years ago)

Author:

ryan

Message:

Trash comments when trashing a post. see #11073

File:

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

trunk/wp-includes/comment.php

@@ -774 +774 @@
 
         $total = 0;
-        $approved = array('0' => 'moderated', '1' => 'approved', 'spam' => 'spam', 'trash' => 'trash');
+        $approved = array('0' => 'moderated', '1' => 'approved', 'spam' => 'spam', 'trash' => 'trash', 'post-trashed' => 'post-trashed');
         $known_types = array_keys( $approved );
         foreach( (array) $count as $row_num => $row ) {
-                $total += $row['num_comments'];
+                // Don't count post-trashed toward totals
+                if ( 'post-trashed' != $row['comment_approved'] )
+                        $total += $row['num_comments'];
                 if ( in_array( $row['comment_approved'], $known_types ) )
                         $stats[$approved[$row['comment_approved']]] = $row['num_comments'];
@@ -1179 +1181 @@
         switch ( $comment_status ) {
                 case 'hold':
+                case '0':
+                case 0:
                         $status = '0';
                         break;
                 case 'approve':
+                case '1':
+                case 1:
                         $status = '1';
                         if ( get_option('comments_notify') ) {