Ticket #38034: 38034.6.diff

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

@@ -1546 +1546 @@
                         'menu_order',
                         'comment_count',
                         'rand',
+                        'post__in',
+                        'post_parent__in',
+                        'post_name__in',
                 );
 
                 $primary_meta_key   = '';
@@ -1576 +1579 @@
                         return false;
                 }
 
+                $orderby_clause = '';
+
                 switch ( $orderby ) {
                         case 'post_name':
                         case 'post_author':
@@ -1603 +1608 @@
                         case 'meta_value_num':
                                 $orderby_clause = "{$primary_meta_query['alias']}.meta_value+0";
                                 break;
+                        case 'post__in':
+                                if ( ! empty( $this->query_vars['post__in'] ) ) {
+                                        $orderby_clause = "FIELD({$wpdb->posts}.ID," . implode( ',', array_map( 'absint', $this->query_vars['post__in'] ) ) . ')';
+                                }
+                                break;
+                        case 'post_parent__in':
+                                if ( ! empty( $this->query_vars['post_parent__in'] ) ) {
+                                        $orderby_clause = "FIELD( {$wpdb->posts}.post_parent," . implode( ', ', array_map( 'absint', $this->query_vars['post_parent__in'] ) ) . ' )';
+                                }
+                                break;
+                        case 'post_name__in':
+                                if ( ! empty( $this->query_vars['post_name__in'] ) ) {
+                                        $post_name__in = array_map( 'sanitize_title_for_query', $this->query_vars['post_name__in'] );
+                                        $post_name__in_string = "'" . implode( "','", $post_name__in ) . "'";
+                                        $orderby_clause = "FIELD( {$wpdb->posts}.post_name," . $post_name__in_string . ' )';
+                                }
+                                break;
                         default:
                                 if ( array_key_exists( $orderby, $meta_clauses ) ) {
                                         // $orderby corresponds to a meta_query clause.
@@ -2239 +2261 @@
                         $q['order'] = $rand ? '' : $this->parse_order( $q['order'] );
                 }
 
+                // These values of orderby should ignore the 'order' parameter.
+                $force_asc = array( 'post__in', 'post_name__in', 'post_parent__in' );
+                if ( isset( $q['orderby'] ) && in_array( $q['orderby'], $force_asc, true ) ) {
+                        $q['order'] = '';
+                }
+
                 // Order by.
                 if ( empty( $q['orderby'] ) ) {
                         /*
@@ -2252 +2280 @@
                         }
                 } elseif ( 'none' == $q['orderby'] ) {
                         $orderby = '';
-                } elseif ( $q['orderby'] == 'post__in' && ! empty( $post__in ) ) {
-                        $orderby = "FIELD( {$wpdb->posts}.ID, $post__in )";
-                } elseif ( $q['orderby'] == 'post_parent__in' && ! empty( $post_parent__in ) ) {
-                        $orderby = "FIELD( {$wpdb->posts}.post_parent, $post_parent__in )";
-                } elseif ( $q['orderby'] == 'post_name__in' && ! empty( $post_name__in ) ) {
-                        $orderby = "FIELD( {$wpdb->posts}.post_name, $post_name__in )";
                 } else {
                         $orderby_array = array();
                         if ( is_array( $q['orderby'] ) ) {

tests/phpunit/tests/post/query.php

@@ -174 +174 @@
                 $this->assertSame( $ordered, wp_list_pluck( $q->posts, 'ID' ) );
         }
 
+        /**
+         * @ticket 38034
+         */
+        public function test_orderby_post__in_array() {
+                $posts = self::factory()->post->create_many( 4 );
+
+                $ordered = array( $posts[2], $posts[0], $posts[3] );
+
+                $q = new WP_Query( array(
+                        'post_type' => 'any',
+                        'post__in' => $ordered,
+                        'orderby' => array( 'post__in' => 'ASC' ),
+                ) );
+                $this->assertSame( $ordered, wp_list_pluck( $q->posts, 'ID' ) );
+        }
+
+        /**
+         * @ticket 38034
+         */
+        public function test_orderby_post__in_array_with_implied_order() {
+                $posts = self::factory()->post->create_many( 4 );
+
+                $ordered = array( $posts[2], $posts[0], $posts[3] );
+
+                $q = new WP_Query( array(
+                        'post_type' => 'any',
+                        'post__in' => $ordered,
+                        'orderby' => 'post__in',
+                ) );
+                $this->assertSame( $ordered, wp_list_pluck( $q->posts, 'ID' ) );
+        }
+
         function test_post__in_attachment_ordering() {
                 $post_id    = self::factory()->post->create();
                 $att_ids    = array();

tests/phpunit/tests/rest-api/rest-posts-controller.php

@@ -291 +291 @@
                 $data     = $response->get_data();
                 $this->assertEquals( 2, count( $data ) );
                 $this->assertEquals( $id1, $data[0]['id'] );
-                $this->assertPostsOrderedBy( "FIELD( {posts}.ID, $id1,$id3 )" );
+                $this->assertPostsOrderedBy( "FIELD({posts}.ID,$id1,$id3)" );
                 // Invalid include should error
                 $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
                 $request->set_param( 'include', 'invalid' );