Ticket #17020: dashboard-recent-comments-3.2.diff

wp-admin/includes/dashboard.php

@@ -594 +594 @@
  * @since 2.5.0
  */
 function wp_dashboard_recent_comments() {
-        global $wpdb;
-
-        if ( current_user_can('edit_posts') )
-                $allowed_states = array('0', '1');
-        else
-                $allowed_states = array('1');
-
         // Select all comment types and filter out spam later for better query performance.
         $comments = array();
-        $start = 0;
 
         $widgets = get_option( 'dashboard_widget_options' );
         $total_items = isset( $widgets['dashboard_recent_comments'] ) && isset( $widgets['dashboard_recent_comments']['items'] )
                 ? absint( $widgets['dashboard_recent_comments']['items'] ) : 5;
+        
+        $comment_args = array(
+                'status' => (current_user_can('edit_posts') ? null : 'hold'),
+                'number' => $total_items,
+                'offset' => 0,
+                'orderby' => 'comment_date_gmt',
+                'order' => 'DESC'
+                );
+        
+        $comments = get_comments( $comment_args );
 
-        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 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 ) )
-                                $comments[] = $comment;
-                }
-
-                $start = $start + 50;
-        }
-
         if ( $comments ) :
 ?>
 
                 <div id="the-comment-list" class="list:comment">
 <?php
                 foreach ( $comments as $comment )
-                        _wp_dashboard_recent_comments_row( $comment );
+                        if( current_user_can( 'read_post', $comment->comment_post_ID) )
+                                _wp_dashboard_recent_comments_row( $comment );
 ?>
 
                 </div>