Ticket #24873: 24873.diff

wp-admin/includes/revision.php

@@ -179 +179 @@
         // Now, grab the initial diff
         $compare_two_mode = is_numeric( $from );
         if ( ! $compare_two_mode ) {
-                $from = array_keys( array_slice( $revisions, array_search( $selected_revision_id, array_keys( $revisions ) ) - 1, 1, true ) );
-                $from = $from[0];
+                $found = array_search( $selected_revision_id, array_keys( $revisions ) );
+                if ( $found )
+                        $from = array_shift( array_keys( array_slice( $revisions, $found - 1, 1, true ) ) );
+                else
+                        $from = 0;
         }
 
         $from = absint( $from );

wp-admin/js/revisions.js

@@ -155 +155 @@
                         this.listenTo( this.slider, 'hovered:revision', this.updateRevision );
                         this.listenTo( this.slider, 'change:hovering', this.setHovering );
                         this.listenTo( this.slider, 'change:scrubbing', this.setScrubbing );
-
-                        this.set({ revision: this.revisions.get( this.frame.get('to') ) });
                 },
 
 
@@ -754 +752 @@
                 },
 
                 prepare: function() {
-                        return _.extend( { type: 'tooltip' }, {
-                                attributes: this.model.get('revision').toJSON()
-                        });
+                        if ( _.isNull( this.model.get('revision') ) )
+                                return;
+                        else
+                                return _.extend( { type: 'tooltip' }, {
+                                        attributes: this.model.get('revision').toJSON()
+                                });
                 },
 
                 render: function() {