WordPress.org

Make WordPress Core

Changeset 24865


Ignore:
Timestamp:
07/29/13 17:27:48 (9 months 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:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/3.6/wp-admin/includes/revision.php

    r24836 r24865  
    180180    $compare_two_mode = is_numeric( $from ); 
    181181    if ( ! $compare_two_mode ) { 
    182         $from = array_keys( array_slice( $revisions, array_search( $selected_revision_id, array_keys( $revisions ) ) - 1, 1, true ) ); 
    183         $from = $from[0]; 
     182        $found = array_search( $selected_revision_id, array_keys( $revisions ) ); 
     183        if ( $found ) 
     184            $from = array_shift( array_keys( array_slice( $revisions, $found - 1, 1, true ) ) ); 
     185        else 
     186            $from = 0; 
    184187    } 
    185188 
  • branches/3.6/wp-admin/js/revisions.js

    r24815 r24865  
    156156            this.listenTo( this.slider, 'change:hovering', this.setHovering ); 
    157157            this.listenTo( this.slider, 'change:scrubbing', this.setScrubbing ); 
    158  
    159             this.set({ revision: this.revisions.get( this.frame.get('to') ) }); 
    160158        }, 
    161159 
     
    755753 
    756754        prepare: function() { 
    757             return _.extend( { type: 'tooltip' }, { 
    758                 attributes: this.model.get('revision').toJSON() 
    759             }); 
     755            if ( _.isNull( this.model.get('revision') ) ) 
     756                return; 
     757            else 
     758                return _.extend( { type: 'tooltip' }, { 
     759                    attributes: this.model.get('revision').toJSON() 
     760                }); 
    760761        }, 
    761762 
Note: See TracChangeset for help on using the changeset viewer.