Changeset 23639 for trunk/wp-admin/revision.php

Timestamp:

03/07/2013 03:32:26 PM (12 years ago)

Author:

westi

Message:

Revisions: Updates to the new Revisions UI.

Various Updates including:

• i18n fixes
• Added tracking of what revision ID was restored
• async fetching of diffs so that slider works sooner even with many revisions

See #23497 props adamsilverstein, ethitter

File:

• trunk/wp-admin/revision.php (modified) (8 diffs)

trunk/wp-admin/revision.php

@@ -11 +11 @@
 wp_reset_vars( array( 'revision', 'action' ) );
 
-$revision_id = absint($revision);
+$revision_id = absint( $revision );
 $redirect = 'edit.php';
 
 switch ( $action ) :
 case 'restore' :
-    if ( !$revision = wp_get_post_revision( $revision_id ) )
+    if ( ! $revision = wp_get_post_revision( $revision_id ) )
         break;
-    if ( !current_user_can( 'edit_post', $revision->post_parent ) )
+    if ( ! current_user_can( 'edit_post', $revision->post_parent ) )
         break;
-    if ( !$post = get_post( $revision->post_parent ) )
+    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 ) ) {
+    if ( ( ! WP_POST_REVISIONS || ! post_type_supports( $post->post_type, 'revisions' ) ) && ! wp_is_post_autosave( $revision ) ) {
         $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 );
 
     wp_restore_post_revision( $revision->ID );
@@ -36 +44 @@
 case 'edit' :
 default :
-    if ( !$revision = wp_get_post_revision( $revision_id ) )
+    if ( ! $revision = wp_get_post_revision( $revision_id ) )
         break;
-    if ( !$post = get_post( $revision->post_parent ) )
+    if ( ! $post = get_post( $revision->post_parent ) )
         break;
 
-    if ( !current_user_can( 'read_post', $revision->ID ) || !current_user_can( 'read_post', $post->ID ) )
+    if ( ! current_user_can( 'read_post', $revision->ID ) || ! current_user_can( 'read_post', $post->ID ) )
         break;
 
@@ -60 +68 @@
 
 // Empty post_type means either malformed object found, or no valid parent was found.
-if ( !$redirect && empty($post->post_type) )
+if ( ! $redirect && empty( $post->post_type ) )
     $redirect = 'edit.php';
 
-if ( !empty($redirect) ) {
+if ( ! empty( $redirect ) ) {
     wp_redirect( $redirect );
     exit;
@@ -69 +77 @@
 
 // This is so that the correct "Edit" menu item is selected.
-if ( !empty($post->post_type) && 'post' != $post->post_type )
+if ( ! empty( $post->post_type ) && 'post' != $post->post_type )
     $parent_file = $submenu_file = 'edit.php?post_type=' . $post->post_type;
 else
@@ -84 +92 @@
 var wpRevisionsSettings = <?php echo json_encode( array( 'post_id' => $post->ID, 'nonce' => wp_create_nonce( 'revisions-ajax-nonce' ) ) ); ?>;
 </script>
+<?php
+    $comparetworevisionslink = get_edit_post_link( $revision->ID );
+?>
 
 <div id="backbonerevisionsoptions"></div>
-
-<br class="clear"/>
 <div class="wrap">
     <div class="icon32 icon32-posts-post" id="icon-edit"><br></div>
@@ -95 +104 @@
         <div id="backbonerevisionsinteract"></div>
         <div id="backbonerevisionsdiff"></div>
-<hr />
-<?php
-    $comparetworevisionslink = get_edit_post_link( $revision->ID );
-?>
+        <hr />
     </div>
 </div>
@@ -108 +114 @@
         <div id="difftitle">{{{ data.revision_date_author }}}</div>
         <div id="diffcancel"><input class="button" onClick="document.location='<?php echo get_edit_post_link( $post->ID ); ?>'" type="submit" id="cancel" value="<?php esc_attr_e( 'Cancel' )?>" /></div>
-        <div id="diffrestore"><input class="button button-primary" onClick="document.location='{{{ data.restoreaction }}}'" type="submit" id="restore" value="<?php esc_attr_e( 'Restore' )?>" /></div>
-        <div id="comparetworevisions"><input type="checkbox" id="comparetwo" value="comparetwo" {{{ data.comparetwochecked }}} name="comparetwo"/> <?php esc_attr_e( 'Compare two revisions' )?></div>
-    </div>
+        <div id="diffrestore"><input class="button button-primary" onClick="document.location='{{{ data.restoreaction }}}'" type="submit" id="restore" value="<?php esc_attr_e( 'Restore revision ID' )?>" /></div>
+        <div id="comparetworevisions"><input type="checkbox" id="comparetwo" value="comparetwo" {{{ data.comparetwochecked }}} name="comparetwo"/> <label for="comparetwo"><?php esc_attr_e( 'Compare two revisions' ); ?></a></div>    </div>
     <div id="removedandadded">
         <div id="removed"><?php _e( 'Removed -' ); ?></div>
@@ -120 +125 @@
 <script id="tmpl-revisionvinteract" type="text/html">
     <div id="diffheader">
-<div id="diffprevious"><input class="button" type="submit" id="previous" value="Previous" /></div>
-            <div id="diffnext"><input class="button" type="submit" id="next" value="Next" /></div>
+<div id="diffprevious"><input class="button" type="submit" id="previous" value="<?php esc_attr_e( 'Previous' ); ?>" /></div>
+            <div id="diffnext"><input class="button" type="submit" id="next" value="<?php esc_attr_e( 'Next' ); ?>" /></div>
             <div id="diffslider">
     <div id="revisioncount">