Changeset 24865

Timestamp:

07/29/2013 05:27:48 PM (13 years ago)

Author:

markjaquith

Message:

Revisions: Fix PHP loading of comparison to first revision, and premature rendering of tooltip.

Props aaroncampbell, markjaquith. Fixes #24873 for 3.6.

Location:

branches/3.6/wp-admin

Files:

• includes/revision.php (modified) (1 diff)
• js/revisions.js (modified) (2 diffs)

branches/3.6/wp-admin/includes/revision.php

@@ -180 +180 @@
         $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;
         }
 

branches/3.6/wp-admin/js/revisions.js

@@ -156 +156 @@
                         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') ) });
                 },
 
@@ -755 +753 @@
 
                 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()
+                                });
                 },