Ticket #41350: 41350-order-by-rand.diff

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

@@ -99 +99 @@
          *                                                'slug', 'term_group', 'term_id', 'id', 'description', 'parent'),
          *                                                'count' for term taxonomy count, 'include' to match the
          *                                                'order' of the $include param, 'meta_value', 'meta_value_num',
-         *                                                the value of `$meta_key`, the array keys of `$meta_query`, or
-         *                                                'none' to omit the ORDER BY clause. Defaults to 'name'.
+     *                                                the value of `$meta_key`, the array keys of `$meta_query`, 'rand'
+     *                                                for a random selection, or 'none' to omit the ORDER BY clause.
+     *                                                Defaults to 'name'.
          *     @type string       $order                  Whether to order terms in ascending or descending order.
          *                                                Accepts 'ASC' (ascending) or 'DESC' (descending).
          *                                                Default 'ASC'.
@@ -834 +835 @@
                         $orderby = '';
                 } elseif ( empty( $_orderby ) || 'id' == $_orderby || 'term_id' === $_orderby ) {
                         $orderby = 't.term_id';
-                } else {
+                } elseif ( in_array( $_orderby, array( 'rand', 'random', 'rand()' ), true ) ) {
+                    $orderby = 'rand()';
+        } else {
                         $orderby = 't.name';
 
                         // This may be a value of orderby related to meta.

tests/phpunit/tests/term/query.php

@@ -143 +143 @@
                 return $clauses;
         }
 
+    /**
+     * @ticket 41350
+     */
+    public function test_order_by_rand() {
+        register_taxonomy( 'wptests_tax', 'post' );
+        $posts = self::factory()->post->create_many( 10, array( 'taxonomy' => 'wptests_tax' ) );
+
+        $q = new WP_Term_Query( array(
+            'taxonomy' => array( 'wptests_tax' ),
+            'orderby' => 'rand',
+            'hide_empty' => false,
+        ) );
+        $this->assertContains( 'ORDER BY rand()', $q->request );
+
+        $q2 = new WP_Term_Query( array(
+            'taxonomy' => array( 'wptests_tax' ),
+            'orderby' => 'random',
+            'hide_empty' => false,
+        ) );
+        $this->assertContains( 'ORDER BY rand()', $q2->request );
+
+        $q3 = new WP_Term_Query( array(
+            'taxonomy' => array( 'wptests_tax' ),
+            'orderby' => 'rand()',
+            'hide_empty' => false,
+        ) );
+        $this->assertContains( 'ORDER BY rand()', $q3->request );
+        
+    }
+
         /**
          * @ticket 37198
          */