Changeset 34212

Timestamp:

09/15/2015 04:34:14 PM (11 years ago)

Author:

wonderboymusic

Message:

WP_Comment_Query: add comment__in to allowed values for $orderby.

Adds unit tests.

Fixes #33883.

Location:

trunk

Files:

• src/wp-includes/class-wp-comment-query.php (modified) (5 diffs)
• tests/phpunit/tests/comment/query.php (modified) (1 diff)

trunk/src/wp-includes/class-wp-comment-query.php

@@ -95 +95 @@
          * @since 4.2.0
          * @since 4.4.0 `$parent__in` and `$parent__not_in` were added.
+         * @since 4.4.0 Order by `comment__in` was added.
          * @access public
          *
@@ -131 +132 @@
          *                                             'comment_date_gmt', 'comment_ID', 'comment_karma',
          *                                             'comment_parent', 'comment_post_ID', 'comment_type', 'user_id',
-         *                                             'meta_value', 'meta_value_num', the value of $meta_key, and the
+         *                                             'comment__in', 'meta_value', 'meta_value_num', the value of $meta_key, and the
          *                                             array keys of `$meta_query`. Also accepts false, an empty array,
          *                                             or 'none' to disable `ORDER BY` clause.
@@ -391 +392 @@
                                 }
 
-                                if ( ! $found_orderby_comment_ID && 'comment_ID' === $_orderby ) {
+                                if ( ! $found_orderby_comment_ID && in_array( $_orderby, array( 'comment_ID', 'comment__in' ) ) ) {
                                         $found_orderby_comment_ID = true;
                                 }
@@ -398 +399 @@
 
                                 if ( ! $parsed ) {
+                                        continue;
+                                }
+
+                                if ( 'comment__in' === $_orderby ) {
+                                        $orderby_array[] = $parsed;
                                         continue;
                                 }
@@ -773 +779 @@
                 } elseif ( $orderby == 'meta_value_num' ) {
                         $parsed = "$wpdb->commentmeta.meta_value+0";
+                } elseif ( $orderby == 'comment__in' ) {
+                        $comment__in = implode( ',', array_map( 'absint', $this->query_vars['comment__in'] ) );
+                        $parsed = "FIELD( {$wpdb->comments}.comment_ID, $comment__in )";
                 } elseif ( in_array( $orderby, $allowed_keys ) ) {
 

trunk/tests/phpunit/tests/comment/query.php

@@ -1838 +1838 @@
                 $this->assertEqualSets( array( $c1, $c2 ), $ids->comments );
         }
+
+        /**
+         * @ticket 33883
+         */
+        public function test_orderby_comment__in() {
+                $this->factory->comment->create( array(
+                        'comment_post_ID' => $this->post_id,
+                        'comment_approved' => '1'
+                ) );
+
+                $c2 = $this->factory->comment->create( array(
+                        'comment_post_ID' => $this->post_id,
+                        'comment_approved' => '1'
+                ) );
+                $c3 = $this->factory->comment->create( array(
+                        'comment_post_ID' => $this->post_id,
+                        'comment_approved' => '1'
+                ) );
+
+                $this->factory->comment->create( array(
+                        'comment_post_ID' => $this->post_id,
+                        'comment_approved' => '1'
+                ) );
+
+
+                $ids = new WP_Comment_Query( array(
+                        'fields' => 'ids',
+                        'comment__in' => array( $c2, $c3 ),
+                        'orderby' => 'comment__in'
+                ) );
+
+                $this->assertEquals( array( $c2, $c3 ), $ids->comments );
+
+        }
 }