<!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>[28541] trunk: Apply `order` to each passed value for `orderby` in `WP_Query`:</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/28541">28541</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-05-22 18:18:11 +0000 (Thu, 22 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Apply `order` to each passed value for `orderby` in `WP_Query`:
* Since `orderby` in `WP_Query` can accept space-delimited sets, yet only one `order` value: when multiple values are passed (and `DESC` is the order), the default sort order `ASC` is being applied to all values before the last in the set.
* There is a unit test that sporadically fails since 3.6 in `tests/post/revision` due to multiple posts having the same `post_date` from being added so rapidly
* When ordering revisions in `wp_get_post_revisions()`, order by `post_date ID`
* Change the `order` value in `wp_get_post_revisions()` to `ASC`. This will produce SQL like: `ORDER BY $wpdb->posts.post_date ASC, $wpdb->posts.ID ASC`. Previously, this would have produced SQL like: `ORDER BY $wpdb->posts.post_date DESC`, and with the addition of ` ID`: `ORDER BY $wpdb->posts.post_date ASC, $wpdb->posts.ID DESC`. Clearly, wrong. The original SQL produced: `ORDER BY $wpdb->posts.post_date DESC`. As such, return the reversions in reverse order using `array_reverse()`. Not doing so would break "Preview Changes."
* Add unit tests to assert that all of this works.
* All existing unit tests pass with the change to ordering multiple `orderby`s in `WP_Query`.
* In the future, we should support independent `order` for each `orderby`, see <a href="http://core.trac.wordpress.org/ticket/17065">#17065</a>.
Props SergeyBiryukov, wonderboymusic.
Fixes <a href="http://core.trac.wordpress.org/ticket/26042">#26042</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesqueryphp">trunk/src/wp-includes/query.php</a></li>
<li><a href="#trunksrcwpincludesrevisionphp">trunk/src/wp-includes/revision.php</a></li>
<li><a href="#trunktestsphpunittestspostrevisionsphp">trunk/tests/phpunit/tests/post/revisions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/query.php (28540 => 28541)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/query.php 2014-05-22 17:39:22 UTC (rev 28540)
+++ trunk/src/wp-includes/query.php 2014-05-22 18:18:11 UTC (rev 28541)
</span><span class="lines">@@ -2668,7 +2668,7 @@
</span><span class="cx">
</span><span class="cx"> $orderby_array[] = $orderby;
</span><span class="cx"> }
</span><del>- $orderby = implode( ',', $orderby_array );
</del><ins>+ $orderby = implode( ' ' . $q['order'] . ', ', $orderby_array );
</ins><span class="cx">
</span><span class="cx"> if ( empty( $orderby ) )
</span><span class="cx"> $orderby = "$wpdb->posts.post_date ".$q['order'];
</span></span></pre></div>
<a id="trunksrcwpincludesrevisionphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/revision.php (28540 => 28541)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/revision.php 2014-05-22 17:39:22 UTC (rev 28540)
+++ trunk/src/wp-includes/revision.php 2014-05-22 18:18:11 UTC (rev 28541)
</span><span class="lines">@@ -417,7 +417,7 @@
</span><span class="cx"> if ( ! $post || empty( $post->ID ) )
</span><span class="cx"> return array();
</span><span class="cx">
</span><del>- $defaults = array( 'order' => 'DESC', 'orderby' => 'date', 'check_enabled' => true );
</del><ins>+ $defaults = array( 'order' => 'ASC', 'orderby' => 'date ID', 'check_enabled' => true );
</ins><span class="cx"> $args = wp_parse_args( $args, $defaults );
</span><span class="cx">
</span><span class="cx"> if ( $args['check_enabled'] && ! wp_revisions_enabled( $post ) )
</span><span class="lines">@@ -428,6 +428,8 @@
</span><span class="cx"> if ( ! $revisions = get_children( $args ) )
</span><span class="cx"> return array();
</span><span class="cx">
</span><ins>+ $revisions = array_reverse( $revisions );
+
</ins><span class="cx"> return $revisions;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunktestsphpunittestspostrevisionsphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/post/revisions.php (28540 => 28541)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/post/revisions.php 2014-05-22 17:39:22 UTC (rev 28540)
+++ trunk/tests/phpunit/tests/post/revisions.php 2014-05-22 18:18:11 UTC (rev 28541)
</span><span class="lines">@@ -338,4 +338,51 @@
</span><span class="cx"> $this->assertTrue( user_can( $author_user_id, 'read_post', $revision->ID ) );
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+ /**
+ * @ticket 26042
+ */
+ function test_wp_get_posts_revisions_sql() {
+ $post = get_default_post_to_edit( 'post', true );
+
+ add_filter( 'query', array( $this, '_filter_query' ) );
+
+ wp_get_post_revisions( $post->ID );
+ }
+
+ function _filter_query( $sql ) {
+ remove_filter( 'query', array( $this, '_filter_query' ) );
+ global $wpdb;
+ $this->assertContains( "ORDER BY $wpdb->posts.post_date ASC, $wpdb->posts.ID ASC", $sql );
+ return $sql;
+ }
+
+ /**
+ * @ticket 26042
+ */
+ function test_revision_order() {
+ $ok = 0;
+ $reversed = 0;
+
+ for ( $i = 0; $i < 100; $i++ ) {
+ $post_id = $this->factory->post->create( array( 'post_title' => 'some-post', 'post_type' => 'post', 'post_content' => 'some_content' ) );
+
+ for ( $j = 1; $j < 3; $j++ ) {
+ wp_update_post( array( 'post_content' => 'updated post' . $j , 'ID' => $post_id ) );
+ }
+
+ $revisions = wp_get_post_revisions( $post_id );
+ $first = array_shift( $revisions );
+ $last = array_pop( $revisions );
+
+ if ( $first->ID < $last->ID ) {
+ $reversed++;
+ } else {
+ $ok++;
+ }
+ }
+
+ $this->assertEquals( 100, $ok );
+ $this->assertEquals( 0, $reversed );
+ }
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>