" )
+ .addClass( "arrow" )
+ .addClass( feedback.vertical )
+ .addClass( feedback.horizontal )
+ .appendTo( $( this ) );
+ }
+ },
+ show: false,
+ hide: false,
+ content: function() {
+ return message;
+ }
+
+ } );
+ },
+/**/
+
+ completeApplicationSetup : function() {
this._revisionView = new wp.revisions.views.View({
model : this._revisions
});
this._revisionView.render();
- $( '#diff_max, #diff_maxof' ).html( this._revisions.length );
- $( '#diff_count' ).html( REVAPP._right_diff );
$( '#slider' ).slider( 'option', 'max', this._revisions.length - 1 );
this.reload_toload_revisions( this._revisions );
+
this._revisionsInteractions = new wp.revisions.views.Interact({
model : this._revisions
});
this._revisionsInteractions.render();
+ this._tickmarkView = new wp.revisions.views.Tickmarks({
+ model : this._revisions
+ });
+ this._tickmarkView.render();
+ this._tickmarkView.resetticks();
+
+
+ /*
+ .on( 'mouseup', function( event ) {
+ REVAPP._keep_tooltip_open = false;
+ $( this ).find('.ui-slider-tooltip').hide();
+ } ).on( 'mousedown', function( event ) {
+ REVAPP._keep_tooltip_open = true;
+ } ).on( 'mouseout', function( event ) {
+ if ( REVAPP._keep_tooltip_open)
+ event.stopImmediatePropagation();
+ });
+ */
/*
//Options hidden for now, moving to screen options
this._revisionsOptions = new wp.revisions.views.Options({
@@ -252,13 +347,74 @@ window.wp = window.wp || {};
wp.revisions.Collection = Backbone.Collection.extend({
model : wp.revisions.Model,
url : ajaxurl + '?action=revisions-data&compare_to=' + wpRevisionsSettings.post_id +
- '&show_autosaves=false&show_split_view=true&nonce=' + wpRevisionsSettings.nonce,
+ '&show_autosaves=true&show_split_view=true&nonce=' + wpRevisionsSettings.nonce,
initialize : function() {
}
} );
_.extend(wp.revisions.views, {
+
+ //Ticks inside slider view
+ //
+ Tickmarks : Backbone.View.extend({
+ el : $('#diff-slider-ticks')[0],
+ tagName : 'diff-slider-ticks-view',
+ className : 'diff-slider-ticks-container',
+ template : wp.template('revision-ticks'),
+ model : wp.revisions.Model,
+
+ resetticks : function() {
+ var slider_max = $( '#slider' ).slider( 'option', 'max');
+ var slider_width = $( '#slider' ).width();
+ var adjust_max = ( 2 === REVAPP._compareoneortwo ) ? 1 : 0;
+ var tick_width = Math.floor( slider_width / ( slider_max - adjust_max ) );
+
+ //TODO: adjust right margins for wider ticks so they stay centered on handle stop point
+
+ //set minimum and maximum widths for tick marks
+ tick_width = (tick_width > 50 ) ? 50 : tick_width;
+ tick_width = (tick_width < 10 ) ? 10 : tick_width;
+
+ slider_width = tick_width * (slider_max - adjust_max ) +1;
+
+ $( '#slider' ).width( slider_width );
+ $( '.diff-slider-ticks-wrapper' ).width( slider_width );
+ $( '#diffslider' ).width( slider_width );
+ $( '#diff-slider-ticks' ).width( slider_width );
+
+ var a_tick_width = $( '.revision-tick' ).width();
+
+ if ( tick_width !== a_tick_width ) { // is the width already set correctly?
+ $( '.revision-tick' ).each( function( ) {
+ $(this).css( 'margin-right', tick_width - 1 + 'px'); //space the ticks out using right margin
+ });
+
+ if( 2 === REVAPP._compareoneortwo ) {
+ $( '.revision-tick' ).first().remove(); //TODO - remove the check
+ }
+ $( '.revision-tick' ).last().css( 'margin-right', '0' ); // last tick gets no right margin
+ }
+
+ },
+
+ //render the tickmark view
+ render : function() {
+ var self = this;
+
+ if ( null !== self.model ) {
+ var addhtml = "";
+ _.each ( self.model.models, function ( the_model ) {
+ addhtml = addhtml + self.template ( the_model.toJSON() );
+ });
+ self.$el.html( addhtml );
+
+ }
+ self.resetticks();
+ return self;
+ }
+ }),
+
//
//primary revision diff view
//
@@ -267,19 +423,16 @@ window.wp = window.wp || {};
tagName : 'revisionvview',
className : 'revisionview-container',
template : wp.template('revision'),
- revvapp : null,
comparetwochecked : '',
draggingleft : false,
- initialize : function(){
- },
-
//
//render the revisions
//
render : function() {
var addhtml = '';
//compare two revisions mode?
+
if ( 2 === REVAPP._compareoneortwo ) {
this.comparetwochecked = 'checked';
if ( this.draggingleft ) {
@@ -310,9 +463,34 @@ window.wp = window.wp || {};
this.$el.html( addhtml );
if ( this.model.length < 3 ) {
$( 'div#comparetworevisions' ).hide(); //don't allow compare two if fewer than three revisions
-
}
- //console.log ( (this.model.at( REVAPP._right_diff - 1 )).url());
+ if ( this.model.length < 2 ) {
+ $( 'div#diffslider' ).hide(); //don't allow compare two if fewer than three revisions
+ $( 'div.diff-slider-ticks-wrapper' ).hide();
+ }
+
+ //
+ // add tooltips to the handles
+ //
+ if ( 2 === REVAPP._compareoneortwo ) {
+ REVAPP.addTooltip ( $( 'a.ui-slider-handle.left-handle' ),
+ ( REVAPP._right_diff >= REVAPP._revisions.length ) ? '' : REVAPP._revisions.at( REVAPP._left_diff ).get( 'revision_date_author_short' ) );
+ REVAPP.addTooltip ( $( 'a.ui-slider-handle.right-handle' ),
+ ( REVAPP._right_diff >= REVAPP._revisions.length ) ? '' : REVAPP._revisions.at( REVAPP._right_diff ).get( 'revision_date_author_short' ) );
+ } else {
+ REVAPP.addTooltip ( $( 'a.ui-slider-handle' ),
+ ( REVAPP._right_diff >= REVAPP._revisions.length ) ? '' : REVAPP._revisions.at( REVAPP._right_diff ).get( 'revision_date_author_short' ) );
+ }
+
+ //
+ // hide the restore button when on the last sport/current post data
+ //
+ if ( REVAPP._right_diff === REVAPP._revisions.length ){
+ $( '.restore-button' ).hide();
+ } else {
+ $( '.restore-button' ).show();
+ }
+
return this;
},
@@ -326,31 +504,42 @@ window.wp = window.wp || {};
//
clickcomparetwo : function(){
self = this;
- if ( $( 'input#comparetwo' ).is( ':checked' ) ) {
+
+ if ( $( 'input#comparetwo' ).is( ':checked' ) ) { //compare 2 mode
REVAPP._compareoneortwo = 2 ;
- REVAPP.reloadleftright();
- } else {
- REVAPP._compareoneortwo = 1 ;
- REVAPP._revisionView.draggingleft = false;
- REVAPP._left_diff = 0;
- REVAPP.reloadmodelsingle();
- }
- REVAPP._revisionsInteractions.render();
+
+ if ( 1 === REVAPP._right_diff )
+ REVAPP._right_diff = 2;
+ REVAPP._revisionView.draggingleft = false;
+
+ wpRevisionsSettings.revision_id = ''; // reset passed revision id so switching back to one handle mode doesn't re-select revision
+ REVAPP.reloadleftright();
+ REVAPP._revisionView.model = REVAPP._right_handle_revisions;
+
+ } else { //compare one mode
+ REVAPP._compareoneortwo = 1 ;
+ REVAPP._revisionView.draggingleft = false;
+ //REVAPP._left_diff = 0;
+ //REVAPP._right_diff = (REVAPP._revisions.length <= REVAPP._right_diff ) ? REVAPP._right_diff + 1 : REVAPP._right_diff + 1;
+ REVAPP.reloadmodelsingle();
+ }
+ //REVAPP._revisionView.render();
+ REVAPP._revisionsInteractions.render();
+ REVAPP._tickmarkView.render();
+
}
}),
//
//options view for show autosaves and show split view options
//
+ /* DISABLED for now
Options : Backbone.View.extend({
el : $('#backbonerevisionsoptions')[0],
tagName : 'revisionoptionsview',
className : 'revisionoptions-container',
template : wp.template('revisionoptions'),
- initialize : function() {
- },
-
//render the options view
render : function() {
var addhtml = this.template;
@@ -396,7 +585,7 @@ window.wp = window.wp || {};
REVAPP.reloadmodel();
}
}),
-
+ */
//
//main interactions view
//
@@ -405,14 +594,8 @@ window.wp = window.wp || {};
tagName : 'revisionvinteract',
className : 'revisionvinteract-container',
template : wp.template('revisionvinteract'),
- _restoreword : '',
initialize : function() {
- this._restoreword = $( 'input#restore' ).attr( 'value' );
- },
-
- reset_restore_button : function() {
- $( 'input#restore' ).attr( 'value', this._restoreword + ' ' + REVAPP._revisions.at( REVAPP._right_diff - 1 ).get( 'ID' ) );
},
render : function() {
@@ -420,10 +603,6 @@ window.wp = window.wp || {};
var addhtml = this.template;
this.$el.html( addhtml );
- $( '#diff_max, #diff_maxof' ).html( this.model.length );
- $( '#diff_count' ).html( REVAPP._right_diff );
- $( '#diff_left_count_inner' ).html( 0 === REVAPP._left_diff ? '' : 'revision' + REVAPP._left_diff );
- self.reset_restore_button();
var modelcount = REVAPP._revisions.length;
@@ -431,23 +610,37 @@ window.wp = window.wp || {};
if ( 1 === REVAPP._compareoneortwo ) {
//set up the slider with a single handle
slider.slider({
- value : REVAPP._right_diff-1,
- min : 0,
- max : modelcount-1,
- step : 1,
+ value: REVAPP._right_diff-1,
+ min: 0,
+ max: modelcount-1,
+ step: 1,
+
//slide interactions for one handles slider
slide : function( event, ui ) {
- if ( REVAPP._right_model_loading ) //left model stoll loading, prevent sliding left handle
- return false;
- REVAPP._right_diff =( ui.value+1 );
- $( '#diff_count' ).html( REVAPP._right_diff );
+ REVAPP._right_diff = ( ui.value + 1 );
REVAPP._revisionView.render();
- self.reset_restore_button();
- }
+ /*
+ $( 'a.ui-slider-handle' ).tooltip( {
+ content: REVAPP._revisions.at( ui.value ).get( 'revision_date_author_short' ),
+ position: {
+ my: "top-65",
+ using: function( position, feedback ) {
+ $( this ).css( position );
+ $( "
" )
+ .addClass( "arrow" )
+ .addClass( feedback.vertical )
+ .addClass( feedback.horizontal )
+ .appendTo( this );
+ }
+ }
+ });//.trigger( 'close' ).trigger( 'open' );
+*/
+ }
});
$( '.revisiondiffcontainer' ).removeClass( 'comparetwo' );
+
} else { //comparing more than one, eg 2
//set up the slider with two handles
slider.slider({
@@ -460,28 +653,33 @@ window.wp = window.wp || {};
//in two handled mode when user starts dragging, swap in precalculated diff for handle
start : function (event, ui ) {
var index = $( ui.handle ).index(); //0 (left) or 1 (right)
-
switch ( index ) {
case 1: //left handle drag
- if ( REVAPP._left_model_loading ) //left model stoll loading, prevent sliding left handle
+ if ( REVAPP._left_model_loading ) //left model still loading, prevent sliding left handle
return false;
- if ( REVAPP._revisionView.model !== REVAPP._left_handle_revisions &&
- null !== REVAPP._left_handle_revisions )
- REVAPP._revisionView.model = REVAPP._left_handle_revisions;
-
REVAPP._revisionView.draggingleft = true;
+
+ if ( REVAPP._revisionView.model !== REVAPP._left_handle_revisions &&
+ null !== REVAPP._left_handle_revisions ) {
+ REVAPP._revisionView.model = REVAPP._left_handle_revisions;
+ REVAPP._tickmarkView.model = REVAPP._left_handle_revisions;
+ REVAPP._tickmarkView.render();
+ }
+
REVAPP._left_diff_start = ui.values[ 0 ];
break;
case 2: //right
- if ( REVAPP._right_model_loading ) //right model stoll loading, prevent sliding right handle
+ if ( REVAPP._right_model_loading || 0 === REVAPP._right_handle_revisions.length) //right model still loading, prevent sliding right handle
return false;
- //one extra spot at left end when comparing two
if ( REVAPP._revisionView.model !== REVAPP._right_handle_revisions &&
- null !== REVAPP._right_handle_revisions )
+ null !== REVAPP._right_handle_revisions ) {
REVAPP._revisionView.model = REVAPP._right_handle_revisions;
+ REVAPP._tickmarkView.model = REVAPP._right_handle_revisions;
+ REVAPP._tickmarkView.render();
+ }
REVAPP._revisionView.draggingleft = false;
REVAPP._right_diff_start = ui.values[ 1 ];
@@ -501,29 +699,26 @@ window.wp = window.wp || {};
if ( REVAPP._left_model_loading ) //left model still loading, prevent sliding left handle
return false;
- REVAPP._left_diff = ui.values[ 0 ] - 1; //one extra spot at left end when comparing two
+ REVAPP._left_diff = ui.values[ 0 ];
break;
case 2: //right
if ( REVAPP._right_model_loading ) //right model still loading, prevent sliding right handle
return false;
- REVAPP._right_diff = ui.values[ 1 ] - 1 ;
+ REVAPP._right_diff = ui.values[ 1 ];
break;
}
- $( '#diff_count' ).html( REVAPP._right_diff );
-
if ( 0 === REVAPP._left_diff ) {
$( '.revisiondiffcontainer' ).addClass( 'currentversion' );
} else {
$( '.revisiondiffcontainer' ).removeClass( 'currentversion' );
- $( '#diff_left_count_inner' ).html( REVAPP._left_diff );
}
- REVAPP._revisionView.render(); //render the diff view
- self.reset_restore_button();
+ REVAPP._revisionView.render();
+
},
//when the user stops sliding in 2 handle mode, recalculate diffs
@@ -536,23 +731,26 @@ window.wp = window.wp || {};
switch ( index ) {
case 1: //left
+
//left handle dragged & changed, reload right handle model
- if ( ! ( REVAPP._left_diff_start === ui.values[ 0 ] || REVAPP._left_model_loading ) )
+ if ( REVAPP._left_diff_start !== ui.values[ 0 ] )
REVAPP.reloadright();
break;
case 2: //right
+ //REVAPP._right_diff = ( 1 >= REVAPP._right_diff ) ? 1 : REVAPP._right_diff-1;
//right handle dragged & changed, reload left handle model if changed
- if ( ! ( REVAPP._right_diff_start === ui.values[ 1 ] || REVAPP._right_model_loading ) ) {
+ if ( REVAPP._right_diff_start !== ui.values[ 1 ] )
REVAPP.reloadleft();
- }
+
break;
}
}
}
});
$( '.revisiondiffcontainer' ).addClass( 'comparetwo' );
+ $( '#diffslider a.ui-slider-handle' ).first().addClass( 'left-handle' ).next().addClass( 'right-handle' );
}
return this;
@@ -571,9 +769,7 @@ window.wp = window.wp || {};
REVAPP._revisionView.render();
- $( '#diff_count' ).html( REVAPP._right_diff );
$( '#slider' ).slider( 'value', REVAPP._right_diff - 1 ).trigger( 'slide' );
- this.reset_restore_button();
},
//go the the previous revision
@@ -583,16 +779,12 @@ window.wp = window.wp || {};
REVAPP._revisionView.render();
- $( '#diff_count' ).html( REVAPP._right_diff );
$( '#slider' ).slider( 'value', REVAPP._right_diff - 1 ).trigger( 'slide' );
- this.reset_restore_button();
}
})
});
//instantiate Revision Application
REVAPP = new wp.revisions.App();
- //TODO consider enable back button to step back thru states?
- //Backbone.history.start({pushState: true});
}(jQuery));
diff --git a/wp-admin/revision.php b/wp-admin/revision.php
index bf8f6dfe42..385d4ef79e 100644
--- a/wp-admin/revision.php
+++ b/wp-admin/revision.php
@@ -17,25 +17,21 @@ switch ( $action ) :
case 'restore' :
if ( ! $revision = wp_get_post_revision( $revision_id ) )
break;
+
if ( ! current_user_can( 'edit_post', $revision->post_parent ) )
break;
+
+
if ( ! $post = get_post( $revision->post_parent ) )
break;
- // Revisions disabled and we're not looking at an autosave
- if ( ( ! WP_POST_REVISIONS || ! post_type_supports( $post->post_type, 'revisions' ) ) && ! wp_is_post_autosave( $revision ) ) {
+ // Revisions disabled (previously checked autosavegs && ! wp_is_post_autosave( $revision ))
+ if ( ( ! WP_POST_REVISIONS || ! post_type_supports( $post->post_type, 'revisions' ) ) ) {
$redirect = 'edit.php?post_type=' . $post->post_type;
break;
}
- check_admin_referer( "restore-post_{$post->ID}|{$revision->ID}" );
- //store revision event in post meta
- $restore_details = array(
- 'restored_revision_id' => $revision->ID,
- 'restored_by_user' => get_current_user_id(),
- 'restored_time' => time()
- );
- update_post_meta( $post->ID, '_post_restored_from', $restore_details );
+ check_admin_referer( "restore-post_{$revision->ID}" );
wp_restore_post_revision( $revision->ID );
$redirect = add_query_arg( array( 'message' => 5, 'revision' => $revision->ID ), get_edit_post_link( $post->ID, 'url' ) );
@@ -58,7 +54,6 @@ default :
}
$post_title = '
' . get_the_title() . '';
- $revision_title = wp_post_revision_title( $revision, false );
$h2 = sprintf( __( 'Compare Revisions of “%1$s”' ), $post_title );
$title = __( 'Revisions' );
@@ -80,41 +75,66 @@ if ( ! empty( $post->post_type ) && 'post' != $post->post_type )
$parent_file = $submenu_file = 'edit.php?post_type=' . $post->post_type;
else
$parent_file = $submenu_file = 'edit.php';
-
wp_enqueue_script( 'revisions' );
require_once( './admin-header.php' );
//TODO - Some of the translations below split things into multiple strings that are contextually related and this makes it pretty impossible for RTL translation.
//TODO can we pass the context in a better way
-?>
-
-ID );
+$wpRevisionsSettings = array( 'post_id' => $post->ID,
+ 'nonce' => wp_create_nonce( 'revisions-ajax-nonce' ),
+ 'revision_id' => $revision_id );
+wp_localize_script( 'revisions', 'wpRevisionsSettings', $wpRevisionsSettings );
+
+$comparetworevisionslink = get_edit_post_link( $revision->ID );
?>
-
+
+
+
'', 'title_left' => '', 'title_right' => '' );
+ $args = wp_parse_args( $args, $defaults );
+
+ if ( !class_exists( 'WP_Text_Diff_Renderer_Table' ) )
+ require( ABSPATH . WPINC . '/wp-diff.php' );
+
+ $left_string = normalize_whitespace( $left_string );
+ $right_string = normalize_whitespace( $right_string );
+
+ $left_lines = explode( "\n", $left_string );
+ $right_lines = explode( "\n", $right_string) ;
+
+ $text_diff = new Text_Diff($left_lines, $right_lines );
+ $linesadded = $text_diff->countAddedLines();
+ $linesdeleted = $text_diff->countDeletedLines();
+
+ $renderer = new WP_Text_Diff_Renderer_Table();
+ $diff = $renderer->render( $text_diff );
+
+ if ( !$diff )
+ return '';
+
+ $r = "
\n";
+
+ if ( ! empty( $args[ 'show_split_view' ] ) ) {
+ $r .= "";
+ } else {
+ $r .= "";
+ }
+
+ if ( $args['title'] || $args['title_left'] || $args['title_right'] )
+ $r .= "";
+ if ( $args['title'] )
+ $r .= "| $args[title] |
|---|
\n";
+ if ( $args['title_left'] || $args['title_right'] ) {
+ $r .= "\n";
+ $r .= "\t | $args[title_left] | \n";
+ $r .= "\t | $args[title_right] | \n";
+ $r .= "
\n";
+ }
+ if ( $args['title'] || $args['title_left'] || $args['title_right'] )
+ $r .= "\n";
+
+ $r .= "\n$diff\n\n";
+ $r .= "
";
+
+ return array( 'html' => $r, 'linesadded' => $linesadded, 'linesdeleted' => $linesdeleted );
+ }
+ endif;
diff --git a/wp-includes/post-template.php b/wp-includes/post-template.php
index 5d130fe208..9df1de9ffd 100644
--- a/wp-includes/post-template.php
+++ b/wp-includes/post-template.php
@@ -1306,11 +1306,50 @@ function wp_post_revision_title( $revision, $link = true ) {
if ( !in_array( $revision->post_type, array( 'post', 'page', 'revision' ) ) )
return false;
+ /* translators: revision date format, see http://php.net/date */
+ $datef = _x( 'j F, Y @ G:i', 'revision date format');
+ /* translators: 1: date */
+ $autosavef = __( '%1$s [Autosave]' );
+ /* translators: 1: date */
+ $currentf = __( '%1$s [Current Revision]' );
+
+ $date = date_i18n( $datef, strtotime( $revision->post_modified ) );
+ if ( $link && current_user_can( 'edit_post', $revision->ID ) && $link = get_edit_post_link( $revision->ID ) )
+ $date = "
$date";
+
+ if ( !wp_is_post_revision( $revision ) )
+ $date = sprintf( $currentf, $date );
+ elseif ( wp_is_post_autosave( $revision ) )
+ $date = sprintf( $autosavef, $date );
+
+ return $date;
+}
+
+/**
+ * Retrieve formatted date timestamp of a revision (linked to that revisions's page).
+ *
+ * @package WordPress
+ * @subpackage Post_Revisions
+ * @since 3.6.0
+ *
+ * @uses date_i18n()
+ *
+ * @param int|object $revision Revision ID or revision object.
+ * @param bool $link Optional, default is true. Link to revisions's page?
+ * @return string gravatar, user, i18n formatted datetimestamp or localized 'Current Revision'.
+ */
+function wp_post_revision_title_expanded( $revision, $link = true ) {
+ if ( !$revision = get_post( $revision ) )
+ return $revision;
+
+ if ( !in_array( $revision->post_type, array( 'post', 'page', 'revision' ) ) )
+ return false;
+
$author = get_the_author_meta( 'display_name', $revision->post_author );
/* translators: revision date format, see http://php.net/date */
$datef = _x( 'j F, Y @ G:i:s', 'revision date format');
- $gravatar = get_avatar( $revision->post_author, 18 );
+ $gravatar = get_avatar( $revision->post_author, 24 );
$date = date_i18n( $datef, strtotime( $revision->post_modified ) );
if ( $link && current_user_can( 'edit_post', $revision->ID ) && $link = get_edit_post_link( $revision->ID ) )
@@ -1388,11 +1427,18 @@ function wp_list_post_revisions( $post_id = 0, $args = null ) {
}
/* translators: post revision: 1: when, 2: author name */
- $titlef = _x( '%1$s by %2$s', 'post revision' );
+ $titlef = _x( '%1$s', 'post revision' );
if ( $parent )
array_unshift( $revisions, $post );
+ // since 3.6 revisions include a copy of the current post data as a revision
+ // the collowing removes this current revision if present from the list of
+ // revisions returned by wp_list_post_revisions, remove these to include the
+ // crrent post revision in the list of revisions
+ if ( wp_first_revision_matches_current_version( $post_id ) )
+ array_pop( $revisions );
+
$rows = $right_checked = '';
$class = false;
$can_edit_post = current_user_can( 'edit_post', $post->ID );
@@ -1402,34 +1448,11 @@ function wp_list_post_revisions( $post_id = 0, $args = null ) {
if ( 'revision' === $type && wp_is_post_autosave( $revision ) )
continue;
- $date = wp_post_revision_title( $revision );
- $name = get_the_author_meta( 'display_name', $revision->post_author );
+ $date = wp_post_revision_title_expanded( $revision );
- if ( 'form-table' == $format ) {
- if ( $left )
- $left_checked = $left == $revision->ID ? ' checked="checked"' : '';
- else
- $left_checked = $right_checked ? ' checked="checked"' : ''; // [sic] (the next one)
- $right_checked = $right == $revision->ID ? ' checked="checked"' : '';
+ $title = sprintf( $titlef, $date );
+ $rows .= "\t
$title\n";
- $class = $class ? '' : " class='alternate'";
-
- if ( $post->ID != $revision->ID && $can_edit_post )
- $actions = '
ID|$revision->ID" ) . '">' . __( 'Restore' ) . '';
- else
- $actions = '';
-
- $rows .= "
\n";
- $rows .= "\t | \n";
- $rows .= "\t | \n";
- $rows .= "\t$date | \n";
- $rows .= "\t$name | \n";
- $rows .= "\t$actions | \n";
- $rows .= "\n";
- } else {
- $title = sprintf( $titlef, $date, $name );
- $rows .= "\t$title\n";
- }
}
if ( 'form-table' == $format ) : ?>
@@ -1479,27 +1502,27 @@ function wp_list_post_revisions( $post_id = 0, $args = null ) {
// if the post was previously restored from a revision
// show the restore event details
//
- if ( $restored_from_meta = get_post_meta( $post->ID, '_post_restored_from', true ) ) {
- $author = get_the_author_meta( 'display_name', $restored_from_meta[ 'restored_by_user' ] );
- /* translators: revision date format, see http://php.net/date */
- $datef = _x( 'j F, Y @ G:i:s', 'revision date format');
- $date = date_i18n( $datef, strtotime( $restored_from_meta[ 'restored_time' ] ) );
- $timesince = human_time_diff( $restored_from_meta[ 'restored_time' ], current_time( 'timestamp' ) );
- ?>
+ if ( $restored_from_meta = get_post_meta( $post->ID, '_post_restored_from', true ) ) {
+ $author = get_the_author_meta( 'display_name', $restored_from_meta[ 'restored_by_user' ] );
+ /* translators: revision date format, see http://php.net/date */
+ $datef = _x( 'j F, Y @ G:i:s', 'revision date format');
+ $date = date_i18n( $datef, strtotime( $restored_from_meta[ 'restored_time' ] ) );
+ $timesince = human_time_diff( $restored_from_meta[ 'restored_time' ], current_time( 'timestamp' ) ) ;
+ ?>
-
-
+
-
-
+
+ ";
- }
+ }
endif;
diff --git a/wp-includes/revision.php b/wp-includes/revision.php
index 7b0cbb5bf8..2b09d59b63 100644
--- a/wp-includes/revision.php
+++ b/wp-includes/revision.php
@@ -404,3 +404,29 @@ function _show_post_preview() {
add_filter('the_preview', '_set_preview');
}
}
+
+/**
+ * Determines if the specified post's most recent revision matches the post (by checking post_modified).
+ *
+ * @package WordPress
+ * @subpackage Post_Revisions
+ * @since 3.6.0
+ *
+ * @param int|object $post Post ID or post object.
+ * @return bool false if not a match, otherwise true.
+ */
+function wp_first_revision_matches_current_version( $post ) {
+
+ if ( ! $post = get_post( $post ) )
+ return false;
+
+ if ( ! $revisions = wp_get_post_revisions( $post->ID ) )
+ return false;
+
+ $last_revision = array_shift( $revisions );
+
+ if ( ! ($last_revision->post_modified == $post->post_modified ) )
+ return false;
+
+ return true;
+}
diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php
index 7942b60147..ece253ddd5 100644
--- a/wp-includes/script-loader.php
+++ b/wp-includes/script-loader.php
@@ -273,7 +273,7 @@ function wp_default_scripts( &$scripts ) {
$scripts->add( 'template', "/wp-includes/js/template$suffix.js", array('underscore'), '1.4.4', 1 );
$scripts->add( 'backbone', '/wp-includes/js/backbone.min.js', array('underscore','jquery', 'template'), '0.9.10', 1 );
- $scripts->add( 'revisions', "/wp-admin/js/revisions$suffix.js", array( 'backbone', 'jquery-ui-slider' ), false, 1 );
+ $scripts->add( 'revisions', "/wp-admin/js/revisions$suffix.js", array( 'backbone', 'jquery-ui-slider', 'jquery-ui-tooltip' ), false, 1 );
$scripts->add( 'imgareaselect', "/wp-includes/js/imgareaselect/jquery.imgareaselect$suffix.js", array('jquery'), '0.9.8', 1 );