Changeset 37225

Timestamp:

04/17/2016 03:16:36 AM (9 years ago)

Author:

boonebgorges

Message:

Query: Allow results to be ordered by post_parent__in.

Props postpostmodern.
Fixes #36515.

Location:

trunk

Files:

• src/wp-includes/query.php (modified) (4 diffs)
• tests/phpunit/tests/post/query.php (modified) (1 diff)

trunk/src/wp-includes/query.php

@@ -1469 +1469 @@
      *              Introduced the `$comment_status` and `$ping_status` parameters.
      *              Introduced `RAND(x)` syntax for `$orderby`, which allows an integer seed value to random sorts.
+     * @since 4.6.0 Added 'post_name__in' support for `$orderby`.
      * @access public
      *
@@ -1524 +1525 @@
      *                                                 'RAND(x)' (where 'x' is an integer seed value),
      *                                                 'comment_count', 'meta_value', 'meta_value_num', 'post__in',
-     *                                                 and the array keys of `$meta_query`.
+     *                                                 'post_name__in', 'post_parent__in', and the array keys
+     *                                                 of `$meta_query`.
      *     @type int          $p                       Post ID.
      *     @type int          $page                    Show the number of posts that would show up on page X of a
@@ -2746 +2748 @@
         } elseif ( is_array( $q['post_name__in'] ) && ! empty( $q['post_name__in'] ) ) {
             $q['post_name__in'] = array_map( 'sanitize_title_for_query', $q['post_name__in'] );
-            $where .= " AND $wpdb->posts.post_name IN ('" . implode( "' ,'", $q['post_name__in'] ) . "')";
+            $post_name__in = "'" . implode( "','", $q['post_name__in'] ) . "'";
+            $where .= " AND $wpdb->posts.post_name IN ($post_name__in)";
         }
 
@@ -2964 +2967 @@
         } 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();

trunk/tests/phpunit/tests/post/query.php

@@ -179 +179 @@
     }
 
+    /**
+     * @ticket 36515
+     */
+    public function test_post_name__in_ordering() {
+        $post_id1 = self::factory()->post->create( array( 'post_name' => 'id-1', 'post_type' => 'page' ) );
+        $post_id2 = self::factory()->post->create( array( 'post_name' => 'id-2', 'post_type' => 'page' ) );
+        $post_id3 = self::factory()->post->create( array(
+            'post_name' => 'id-3',
+            'post_type' => 'page',
+            'post_parent' => $post_id2
+        ) );
+
+        $ordered = array( 'id-2', 'id-3', 'id-1' );
+
+        $q = new WP_Query( array(
+            'post_type' => 'any',
+            'post_name__in' => $ordered,
+            'orderby' => 'post_name__in'
+        ) );
+
+        $this->assertSame( $ordered, wp_list_pluck( $q->posts, 'post_name' ) );
+    }
+
     function test_post_status() {
         $statuses1 = get_post_stati();