Changeset 29760

Timestamp:

09/23/2014 03:51:24 AM (12 years ago)

Author:

wonderboymusic

Message:

Ordering by RAND():

The shortcode callbacks for gallery and playlist check for 'RAND' == $atts['order'], which isn't a valid value for order. Remove those checks and update the docs.

In WP_Query, if the value of orderby is rand, order is irrelevant and should be unset.

Adds unit tests.

Fixes #29629.

Location:

trunk

Files:

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

trunk/src/wp-includes/media.php

@@ -960 +960 @@
 
         $id = intval( $atts['id'] );
-        if ( 'RAND' == $atts['order'] ) {
-                $atts['orderby'] = 'none';
-        }
 
         if ( ! empty( $atts['include'] ) ) {
@@ -1167 +1164 @@
  *     @type string  $type         Type of playlist to display. Accepts 'audio' or 'video'. Default 'audio'.
  *     @type string  $order        Designates ascending or descending order of items in the playlist.
- *                                 Accepts 'ASC', 'DESC', or 'RAND'. Default 'ASC'.
+ *                                 Accepts 'ASC', 'DESC'. Default 'ASC'.
  *     @type string  $orderby      Any column, or columns, to sort the playlist. If $ids are
  *                                 passed, this defaults to the order of the $ids array ('post__in').
@@ -1244 +1241 @@
 
         $id = intval( $atts['id'] );
-        if ( 'RAND' == $atts['order'] ) {
-                $atts['orderby'] = 'none';
-        }
 
         $args = array(

trunk/src/wp-includes/query.php

@@ -2796 +2796 @@
                 $where .= $search . $whichauthor . $whichmimetype;
 
+                $rand = ( isset( $q['orderby'] ) && 'rand' === $q['orderby'] );
                 if ( ! isset( $q['order'] ) ) {
-                        $q['order'] = 'DESC';
+                        $q['order'] = $rand ? '' : 'DESC';
                 } else {
-                        $q['order'] = $this->parse_order( $q['order'] );
+                        $q['order'] = $rand ? '' : $this->parse_order( $q['order'] );
                 }
 
@@ -2850 +2851 @@
 
                                 if ( empty( $orderby ) ) {
-                                        $orderby = "$wpdb->posts.post_date ".$q['order'];
-                                } else {
+                                        $orderby = "$wpdb->posts.post_date " . $q['order'];
+                                } elseif ( ! empty( $q['order'] ) ) {
                                         $orderby .= " {$q['order']}";
                                 }

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

@@ -832 +832 @@
                 );
         }
+
+        /**
+         * @ticket 29629
+         */
+        function test_orderby() {
+                // 'rand' is a valid value
+                $q = new WP_Query( array( 'orderby' => 'rand' ) );
+                $this->assertContains( 'ORDER BY RAND()', $q->request );
+                $this->assertNotContains( 'ASC', $q->request );
+                $this->assertNotContains( 'DESC', $q->request );
+
+                // This isn't allowed
+                $q2 = new WP_Query( array( 'order' => 'rand' ) );
+                $this->assertContains( 'ORDER BY', $q2->request );
+                $this->assertNotContains( 'RAND()', $q2->request );
+                $this->assertContains( 'DESC', $q2->request );
+
+                // 'none' is a valid value
+                $q3 = new WP_Query( array( 'orderby' => 'none' ) );
+                $this->assertNotContains( 'ORDER BY', $q3->request );
+                $this->assertNotContains( 'DESC', $q3->request );
+                $this->assertNotContains( 'ASC', $q3->request );
+
+                // false is a valid value
+                $q4 = new WP_Query( array( 'orderby' => false ) );
+                $this->assertNotContains( 'ORDER BY', $q4->request );
+                $this->assertNotContains( 'DESC', $q4->request );
+                $this->assertNotContains( 'ASC', $q4->request );
+
+                // empty array() is a valid value
+                $q5 = new WP_Query( array( 'orderby' => array() ) );
+                $this->assertNotContains( 'ORDER BY', $q5->request );
+                $this->assertNotContains( 'DESC', $q5->request );
+                $this->assertNotContains( 'ASC', $q5->request );
+        }
 }