Ticket #21101: 21101.diff

comment.php

@@ -223 +223 @@
                         'user_id' => '',
                         'search' => '',
                         'count' => false,
-                        // lets us override the status query var by explicitly setting a value for comment_approved
-                        'comment_approved' => false,
                 );
 
                 $this->query_vars = wp_parse_args( $query_vars, $defaults );
@@ -250 +248 @@
                         $approved = "comment_approved = '0'";
                 elseif ( 'approve' == $status )
                         $approved = "comment_approved = '1'";
-                elseif ( 'spam' == $status )
-                        $approved = "comment_approved = 'spam'";
-                elseif ( 'trash' == $status )
-                        $approved = "comment_approved = 'trash'";
+                elseif ( ! empty( $status ) )
+                        $approved = $wpdb->prepare( "comment_approved = %s", $status );
                 else
                         $approved = "( comment_approved = '0' OR comment_approved = '1' )";
 
-                if ( false !== $comment_approved ) {
-                        $approved = $wpdb->prepare( 'comment_approved = %s', $comment_approved );
-                }
-
                 $order = ( 'ASC' == strtoupper($order) ) ? 'ASC' : 'DESC';
 
                 if ( ! empty( $orderby ) ) {