Ticket #56499: 56499.diff

src/wp-admin/includes/dashboard.php

@@ -1058 +1058 @@
                 $comments_query['status'] = 'approve';
         }
 
-        while ( count( $comments ) < $total_items && $possible = get_comments( $comments_query ) ) {
-                if ( ! is_array( $possible ) ) {
+        do {
+                $possible = get_comments( $comments_query );
+
+                if ( empty( $possible ) || ! is_array( $possible ) ) {
                         break;
                 }
 
@@ -1068 +1070 @@
                                 continue;
                         }
 
-                        $comments[] = $comment;
+                        $comments[]     = $comment;
+                        $comments_count = count( $comments );
 
-                        if ( count( $comments ) === $total_items ) {
+                        if ( $comments_count === $total_items ) {
                                 break 2;
                         }
                 }
@@ -1077 +1080 @@
 
                 $comments_query['offset'] += $comments_query['number'];
                 $comments_query['number']  = $total_items * 10;
-        }
+        } while ( $comments_count < $total_items );
 
         if ( $comments ) {
                 echo '<div id="latest-comments" class="activity-block table-view-list">';