Changeset 29760 for trunk/src/wp-includes/query.php

Timestamp:

09/23/2014 03:51:24 AM (11 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.

File:

• trunk/src/wp-includes/query.php (modified) (2 diffs)

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']}";
                 }