Ticket #14222: 14222.2.patch

wp-admin/includes/dashboard.php

@@ -523 +523 @@
         global $wpdb;
 
         if ( current_user_can('edit_posts') )
-                $allowed_states = array('0', '1');
+                $allowed_states = 'c.comment_approved IN (0,1) AND';
         else
-                $allowed_states = array('1');
+                $allowed_states = 'c.comment_approved = 1 AND' ;
 
-        // Select all comment types and filter out spam later for better query performance.
         $comments = array();
         $start = 0;
 
@@ -537 +536 @@
         else
                 $total_items = 5;
 
-        while ( count( $comments ) < 5 && $possible = $wpdb->get_results( "SELECT * FROM $wpdb->comments c LEFT JOIN $wpdb->posts p ON c.comment_post_ID = p.ID WHERE p.post_status != 'trash' ORDER BY c.comment_date_gmt DESC LIMIT $start, 50" ) ) {
+        while ( count( $comments ) < $total_items && $possible = $wpdb->get_results( "SELECT * FROM $wpdb->comments c LEFT JOIN $wpdb->posts p ON c.comment_post_ID = p.ID WHERE $allowed_states p.post_status != 'trash' ORDER BY c.comment_date_gmt DESC LIMIT $start, 50" ) ) {
 
                 foreach ( $possible as $comment ) {
                         if ( count( $comments ) >= $total_items )
                                 break;
-                        if ( in_array( $comment->comment_approved, $allowed_states ) && current_user_can( 'read_post', $comment->comment_post_ID ) )
+                        if ( current_user_can( 'read_post', $comment->comment_post_ID ) )
                                 $comments[] = $comment;
                 }