Changeset 32600

Timestamp:

05/25/2015 05:58:52 PM (11 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.

Location:

trunk/src

Files:

• wp-admin/includes/class-wp-comments-list-table.php (modified) (1 diff)
• wp-admin/includes/dashboard.php (modified) (1 diff)
• wp-includes/class-wp-xmlrpc-server.php (modified) (1 diff)
• wp-includes/default-widgets.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(

trunk/src/wp-admin/includes/dashboard.php

@@ -767 +767 @@
 
         while ( count( $comments ) < $total_items && $possible = get_comments( $comments_query ) ) {
+                if ( ! is_array( $possible ) ) {
+                        break;
+                }
                 foreach ( $possible as $comment ) {
                         if ( ! current_user_can( 'read_post', $comment->comment_post_ID ) )

trunk/src/wp-includes/class-wp-xmlrpc-server.php

@@ -3197 +3197 @@
                         $number = absint($struct['number']);
 
-                $comments = get_comments( array('status' => $status, 'post_id' => $post_id, 'offset' => $offset, 'number' => $number ) );
+                $comments = get_comments( array( 'status' => $status, 'post_id' => $post_id, 'offset' => $offset, 'number' => $number ) );
 
                 $comments_struct = array();
-
-                foreach ( $comments as $comment ) {
-                        $comments_struct[] = $this->_prepare_comment( $comment );
+                if ( is_array( $comments ) ) {
+                        foreach ( $comments as $comment ) {
+                                $comments_struct[] = $this->_prepare_comment( $comment );
+                        }
                 }
 

trunk/src/wp-includes/default-widgets.php

@@ -1010 +1010 @@
 
                 $output .= '<ul id="recentcomments">';
-                if ( $comments ) {
+                if ( is_array( $comments ) && $comments ) {
                         // Prime cache for associated posts. (Prime post term cache if we need it for permalinks.)
                         $post_ids = array_unique( wp_list_pluck( $comments, 'comment_post_ID' ) );