Ticket #23901: 23901-9.patch

wp-admin/includes/ajax-actions.php

@@ -2129 +2129 @@
                         $left_revision = get_post( $post_id );
 
                 // make sure the right revision is the most recent
-                if ( $compare_two_mode && $right_revision->ID < $left_revision->ID ) {
+                if ( $compare_two_mode && $right_revision->post_date < $left_revision->post_date ) {
                         $temp = $left_revision;
                         $left_revision = $right_revision;
                         $right_revision = $temp;

wp-includes/post-template.php

@@ -1387 +1387 @@
  *
  * Second argument controls parameters:
  *   (bool)   parent : include the parent (the "Current Revision") in the list.
+ *                     Deprecated (ignored), since 3.6 the revisions always include
+ *                     a copy of the current post.
  *   (string) format : 'list' or 'form-table'. 'list' outputs UL, 'form-table'
  *                     outputs TABLE with UI.
  *   (int)    right  : what revision is currently being viewed - used in
@@ -1413 +1415 @@
         if ( !$post = get_post( $post_id ) )
                 return;
 
-        $defaults = array( 'parent' => false, 'right' => false, 'left' => false, 'format' => 'list', 'type' => 'all' );
+        $defaults = array( 'right' => false, 'left' => false, 'format' => 'list', 'type' => 'all' );
         extract( wp_parse_args( $args, $defaults ), EXTR_SKIP );
 
         if ( !$revisions = wp_get_post_revisions( $post->ID ) )
@@ -1422 +1424 @@
         /* translators: post revision: 1: when, 2: author name */
         $titlef = _x( '%1$s', 'post revision' );
 
-        // Since 3.6 revisions include a copy of the current post data as a revision.
-        // The following removes that revision when $parent == false
-        $parent_included = _wp_get_post_revision_version( reset( $revisions ) ) > 0;
-        if ( $parent_included && ! $parent )
-                array_shift( $revisions );
-        elseif ( ! $parent_included && $parent )
-                array_unshift( $revisions, $post );
-
         $rows = $right_checked = '';
         $class = false;
         $can_edit_post = current_user_can( 'edit_post', $post->ID );