Ticket #28434: 28434.diff

src/wp-includes/comment.php

@@ -245 +245 @@
 
                 $defaults = array(
                         'author_email' => '',
+                        'fields' => '',
                         'ID' => '',
                         'karma' => '',
                         'number' => '',
@@ -368 +369 @@
                 if ( $this->query_vars['count'] ) {
                         $fields = 'COUNT(*)';
                 } else {
-                        $fields = '*';
+                        switch ( strtolower( $this->query_vars['fields'] ) ) {
+                                case 'ids':
+                                        $fields = "$wpdb->comments.comment_ID";
+                                        break;
+                                case 'id=>parent':
+                                        $fields = "$wpdb->comments.comment_ID, $wpdb->comments.comment_post_ID";
+                                        break;
+                                default:
+                                        $fields = "*";
+                                        break;
+                        }
                 }
+
                 $join = '';
                 $where = $approved;
 
@@ -460 +472 @@
                 if ( $this->query_vars['count'] ) {
                         return $wpdb->get_var( $query );
                 }
+
+                if ( 'ids' == $this->query_vars['fields'] ) {
+                        $this->comments = $wpdb->get_col( $query );
+                        return array_map( 'intval', $this->comments );
+                }
+
+                if ( 'id=>parent' == $this->query_vars['fields'] ) {
+                        $this->comments = $wpdb->get_results( $query );
+
+                        $r = array();
+                        foreach ( $this->comments as $comments ) {
+                                $r[ (int) $comments->comment_ID ] = (int) $comments->comment_post_ID;
+                        }
+                        return $r;
+                }
+
+
                 $results = $wpdb->get_results( $query );
                 /**
                  * Filter the comment query results.

tests/phpunit/tests/comment/query.php

@@ -180 +180 @@
                 $this->assertEquals( $users[1], $comments[2]->user_id );
 
         }
+
+        /**
+         * @ticket 28434
+         */
+        function test_fields_query() {
+
+                $comment_id1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7, 'comment_approved' => '1' ) );
+                $comment_id2 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '1' ) );
+                $comment_id3 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '1' ) );
+
+                $comments1 = get_comments( array( 'fields' => 'ids' ) );
+                $this->assertEquals( 3, count( $comments1 ) );
+                $this->assertEquals( array(
+                        $comment_id1,
+                        $comment_id2,
+                        $comment_id3
+                ), $comments1 );
+
+                $comments2 = get_comments( array( 'fields' => 'id=>parent' ) );
+                $this->assertEquals( 3, count( $comments2 ) );
+                $this->assertEquals( array(
+                        $comment_id1 => $this->post_id,
+                        $comment_id2 => $this->post_id,
+                        $comment_id3 => $this->post_id
+                ), $comments2 );
+        }
 }