Changeset 23872

Timestamp:

03/29/2013 08:50:09 PM (12 years ago)

Author:

markjaquith

Message:

Make sure the first revision is seen as coming from emptiness, so it can be restored.

props adamsilverstein. fixes #23898.

Location:

trunk

Files:

• wp-admin/includes/ajax-actions.php (modified) (4 diffs)
• wp-admin/js/revisions.js (modified) (1 diff)
• wp-includes/post-template.php (modified) (2 diffs)

trunk/wp-admin/includes/ajax-actions.php

@@ -2131 +2131 @@
         $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 ) {
@@ -2156 +2159 @@
                  $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' ] ) )
@@ -2186 +2190 @@
 
     $previous_revision_id = 0;
+
     foreach ( $revisions as $revision ) :
         //error_log( ( $show_autosaves  ));
@@ -2270 +2275 @@
             $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,

trunk/wp-admin/js/revisions.js

@@ -425 +425 @@
             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(

trunk/wp-includes/post-template.php

@@ -1427 +1427 @@
     $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 );
@@ -1437 +1437 @@
         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 ) )