Ticket #23898: 23898.diff

wp-includes/post-template.php

@@ -1426 +1426 @@
         // The following removes that revision when $parent == false
         $parent_included = _wp_last_revision_matches_current_post( $post_id );
         if ( $parent_included && ! $parent )
-                array_pop( $revisions );
+                array_shift( $revisions );
         elseif ( ! $parent_included && $parent )
                 array_unshift( $revisions, $post );
 
@@ -1436 +1436 @@
         foreach ( $revisions as $revision ) {
                 if ( !current_user_can( 'read_post', $revision->ID ) )
                         continue;
-                
+
                 $is_autosave = wp_is_post_autosave( $revision );
                 if ( ( 'revision' === $type && $is_autosave ) || ( 'autosave' === $type && ! $is_autosave ) )
                         continue;

wp-admin/includes/ajax-actions.php

@@ -2130 +2130 @@
         if ( 0 != $single_revision_id ) {
                 $right_revision = get_post( $single_revision_id );
 
+        if ( 0 == $compare_to )
+                        $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 ) {
                 $temp = $left_revision;
@@ -2155 +2158 @@
                         if ( ! empty( $show_split_view ) )
                                  $args = array( 'show_split_view' => true );
 
-                        $diff = wp_text_diff_with_count( $left_content, $right_content, $args );
+                        // compare_to == 0 means first revision, so compare to a blank field to show whats changed
+                        $diff = wp_text_diff_with_count( ( 0 == $compare_to) ? '' : $left_content, $right_content, $args );
 
                         if ( isset( $diff[ 'html' ] ) )
                                 $content .= $diff[ 'html' ];
@@ -2185 +2189 @@
         $revisions = array_reverse( $revisions );
 
         $previous_revision_id = 0;
+
         foreach ( $revisions as $revision ) :
                 //error_log( ( $show_autosaves  ));
                 if ( empty( $show_autosaves ) && wp_is_post_autosave( $revision ) )
@@ -2269 +2274 @@
                         $revision_from_date_author = $revision_date_author;
                         $revision_date_author = $tmp;
                 }
-                if ( ( $compare_two_mode || 0 !== $previous_revision_id ) ) {
+                if ( ( $compare_two_mode || -1 !== $previous_revision_id ) ) {
                         $alltherevisions[] = array (
                                 'ID' => $revision->ID,
                                 'revision_date_author' => $revision_date_author,

wp-admin/js/revisions.js

@@ -424 +424 @@
                         // render the revisions
                         render: function() {
                                 var addHtml = '';
+                                var thediff;
                                 // compare two revisions mode?
 
                                 if ( 2 === REVAPP._compareOneOrTwo ) {
+
                                         this.comparetwochecked = 'checked';
                                         if ( this.draggingLeft ) {
-                                                        if ( this.model.at( REVAPP._leftDiff ) ) {
+                                                thediff = REVAPP._leftDiff -1;
+                                                if ( this.model.at( thediff ) ) {
                                                         addHtml = this.template( _.extend(
-                                                                this.model.at( REVAPP._leftDiff ).toJSON(),
+                                                                this.model.at( thediff ).toJSON(),
                                                                 { comparetwochecked: this.comparetwochecked } // keep the checkmark checked
                                                         ) );
                                                 }
                                         } else { // dragging right handle
-                                                var thediff = REVAPP._rightDiff;
+                                                thediff = REVAPP._rightDiff -1;
                                                 if ( this.model.at( thediff ) ) {
                                                         addHtml = this.template( _.extend(
                                                                 this.model.at( thediff ).toJSON(),