<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[29760] trunk: Ordering by `RAND()`:</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/29760">29760</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-09-23 03:51:24 +0000 (Tue, 23 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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 <a href="http://core.trac.wordpress.org/ticket/29629">#29629</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesmediaphp">trunk/src/wp-includes/media.php</a></li>
<li><a href="#trunksrcwpincludesqueryphp">trunk/src/wp-includes/query.php</a></li>
<li><a href="#trunktestsphpunittestspostqueryphp">trunk/tests/phpunit/tests/post/query.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/media.php (29759 => 29760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/media.php 2014-09-23 03:37:06 UTC (rev 29759)
+++ trunk/src/wp-includes/media.php 2014-09-23 03:51:24 UTC (rev 29760)
</span><span class="lines">@@ -959,9 +959,6 @@
</span><span class="cx"> ), $attr, 'gallery' );
</span><span class="cx">
</span><span class="cx"> $id = intval( $atts['id'] );
</span><del>- if ( 'RAND' == $atts['order'] ) {
- $atts['orderby'] = 'none';
- }
</del><span class="cx">
</span><span class="cx"> if ( ! empty( $atts['include'] ) ) {
</span><span class="cx"> $_attachments = get_posts( array( 'include' => $atts['include'], 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => $atts['order'], 'orderby' => $atts['orderby'] ) );
</span><span class="lines">@@ -1166,7 +1163,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @type string $type Type of playlist to display. Accepts 'audio' or 'video'. Default 'audio'.
</span><span class="cx"> * @type string $order Designates ascending or descending order of items in the playlist.
</span><del>- * Accepts 'ASC', 'DESC', or 'RAND'. Default 'ASC'.
</del><ins>+ * Accepts 'ASC', 'DESC'. Default 'ASC'.
</ins><span class="cx"> * @type string $orderby Any column, or columns, to sort the playlist. If $ids are
</span><span class="cx"> * passed, this defaults to the order of the $ids array ('post__in').
</span><span class="cx"> * Otherwise default is 'menu_order ID'.
</span><span class="lines">@@ -1243,9 +1240,6 @@
</span><span class="cx"> ), $attr, 'playlist' );
</span><span class="cx">
</span><span class="cx"> $id = intval( $atts['id'] );
</span><del>- if ( 'RAND' == $atts['order'] ) {
- $atts['orderby'] = 'none';
- }
</del><span class="cx">
</span><span class="cx"> $args = array(
</span><span class="cx"> 'post_status' => 'inherit',
</span></span></pre></div>
<a id="trunksrcwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/query.php (29759 => 29760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/query.php 2014-09-23 03:37:06 UTC (rev 29759)
+++ trunk/src/wp-includes/query.php 2014-09-23 03:51:24 UTC (rev 29760)
</span><span class="lines">@@ -2795,10 +2795,11 @@
</span><span class="cx">
</span><span class="cx"> $where .= $search . $whichauthor . $whichmimetype;
</span><span class="cx">
</span><ins>+ $rand = ( isset( $q['orderby'] ) && 'rand' === $q['orderby'] );
</ins><span class="cx"> if ( ! isset( $q['order'] ) ) {
</span><del>- $q['order'] = 'DESC';
</del><ins>+ $q['order'] = $rand ? '' : 'DESC';
</ins><span class="cx"> } else {
</span><del>- $q['order'] = $this->parse_order( $q['order'] );
</del><ins>+ $q['order'] = $rand ? '' : $this->parse_order( $q['order'] );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Order by.
</span><span class="lines">@@ -2849,8 +2850,8 @@
</span><span class="cx"> $orderby = implode( ' ' . $q['order'] . ', ', $orderby_array );
</span><span class="cx">
</span><span class="cx"> if ( empty( $orderby ) ) {
</span><del>- $orderby = "$wpdb->posts.post_date ".$q['order'];
- } else {
</del><ins>+ $orderby = "$wpdb->posts.post_date " . $q['order'];
+ } elseif ( ! empty( $q['order'] ) ) {
</ins><span class="cx"> $orderby .= " {$q['order']}";
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunktestsphpunittestspostqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/post/query.php (29759 => 29760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/post/query.php 2014-09-23 03:37:06 UTC (rev 29759)
+++ trunk/tests/phpunit/tests/post/query.php 2014-09-23 03:51:24 UTC (rev 29760)
</span><span class="lines">@@ -831,4 +831,39 @@
</span><span class="cx"> $q3->request
</span><span class="cx"> );
</span><span class="cx"> }
</span><ins>+
+ /**
+ * @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 );
+ }
</ins><span class="cx"> }
</span><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>