Changeset 32600 for trunk/src/wp-admin/includes/class-wp-comments-list-table.php

Timestamp:

05/25/2015 05:58:52 PM (10 years ago)

Author:

wonderboymusic

Message:

get_comments() can return int, so a few places need to check if the return value is traversable before passing what is assumed to be an array.

See #32444.

File:

• trunk/src/wp-admin/includes/class-wp-comments-list-table.php (modified) (1 diff)

trunk/src/wp-admin/includes/class-wp-comments-list-table.php

@@ -117 +117 @@
 
         $_comments = get_comments( $args );
-
-        update_comment_cache( $_comments );
-
-        $this->items = array_slice( $_comments, 0, $comments_per_page );
-        $this->extra_items = array_slice( $_comments, $comments_per_page );
-
-        $total_comments = get_comments( array_merge( $args, array('count' => true, 'offset' => 0, 'number' => 0) ) );
-
-        $_comment_post_ids = array();
-        foreach ( $_comments as $_c ) {
-            $_comment_post_ids[] = $_c->comment_post_ID;
-        }
-
-        $_comment_post_ids = array_unique( $_comment_post_ids );
-
-        $this->pending_count = get_pending_comments_num( $_comment_post_ids );
+        if ( is_array( $_comments ) ) {
+            update_comment_cache( $_comments );
+
+            $this->items = array_slice( $_comments, 0, $comments_per_page );
+            $this->extra_items = array_slice( $_comments, $comments_per_page );
+
+            $_comment_post_ids = array_unique( wp_list_pluck( $_comments, 'comment_post_ID' ) );
+
+            $this->pending_count = get_pending_comments_num( $_comment_post_ids );
+        }
+
+        $total_comments = get_comments( array_merge( $args, array(
+            'count' => true,
+            'offset' => 0,
+            'number' => 0
+        ) ) );
 
         $this->set_pagination_args( array(