Changeset 23831

Timestamp:

03/28/2013 01:51:12 AM (12 years ago)

Author:

markjaquith

Message:

correct a revision/tooltip mismatch.

props adamsilverstein. see #23497

Location:

trunk/wp-admin

Files:

• includes/ajax-actions.php (modified) (2 diffs)
• js/revisions.js (modified) (1 diff)

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

@@ -2131 +2131 @@
         $right_revision = get_post( $single_revision_id );
 
-        //
-        //make sure the left revision is the most recent
-        //
-
-        if ( strtotime( $right_revision->post_modified_gmt ) < strtotime( $left_revision->post_modified_gmt ) ) {
-            $temp = $left_revision;
-            $left_revision = $right_revision;
-            $right_revision = $temp;
-        }
-
         $linesadded=0;
         $linesdeleted=0;
@@ -2183 +2173 @@
     } //end single model fetch
 
-    //fetch the list of revisions available
-
-    //if we are comparing two revisions, the first 'revision' represented by the leftmost
-    //slider position is the current revision, prepend a comparison to this revision
-    if ( ! wp_first_revision_matches_current_version( $post_id ) ) //revisions don't have current version
-        array_unshift( $revisions, get_post( $post_id ) ) ;
-    //$revisions->append ( get_post( $post_id ) );
-    //error_log( var_dump( $revisions ));
     $count = -1;
 

trunk/wp-admin/js/revisions.js

@@ -466 +466 @@
                 if ( 2 === REVAPP._compareOneOrTwo ) {
                     REVAPP.addTooltip ( $( 'a.ui-slider-handle.left-handle' ),
-                        ( REVAPP._rightDiff >= REVAPP._revisions.length ) ? '' : REVAPP._revisions.at( REVAPP._leftDiff ).get( 'revision_date_author_short' ) );
+                        ( REVAPP._leftDiff < 0 ) ? '' : REVAPP._revisions.at( REVAPP._leftDiff - 1 ).get( 'revision_date_author_short' ) );
                     REVAPP.addTooltip ( $( 'a.ui-slider-handle.right-handle' ),
-                        ( REVAPP._rightDiff >= REVAPP._revisions.length ) ? '' : REVAPP._revisions.at( REVAPP._rightDiff ).get( 'revision_date_author_short' ) );
+                        ( REVAPP._rightDiff > REVAPP._revisions.length ) ? '' : REVAPP._revisions.at( REVAPP._rightDiff - 1 ).get( 'revision_date_author_short' ) );
                 } else {
                     REVAPP.addTooltip ( $( 'a.ui-slider-handle' ),
-                        ( REVAPP._rightDiff >= REVAPP._revisions.length ) ? '' : REVAPP._revisions.at( REVAPP._rightDiff ).get( 'revision_date_author_short' ) );
+                        ( REVAPP._rightDiff > REVAPP._revisions.length ) ? '' : REVAPP._revisions.at( REVAPP._rightDiff - 1 ).get( 'revision_date_author_short' ) );
                 }