Changeset 24667 for trunk/wp-admin/includes/revision.php

Timestamp:

07/12/2013 05:11:56 AM (12 years ago)

Author:

markjaquith

Message:

Revisions: Loading indicator, cleanup, bug fixes.

• Loading indicator when the user is waiting for a trip to the server.
• Bug fixes for diff priming.
• Fix the date display.
• Forget about local comparator, instead order by modified on the server.
• Initialize the frame model before the view (this was the source of a LOT of heartache).

File:

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

trunk/wp-admin/includes/revision.php

@@ -67 +67 @@
     $now_gmt = time();
 
-    $revisions = wp_get_post_revisions( $post->ID );
+    $revisions = wp_get_post_revisions( $post->ID, array( 'order' => 'ASC', 'orderby' => 'modified' ) );
 
     cache_users( wp_list_pluck( $revisions, 'post_author' ) );
 
     foreach ( $revisions as $revision ) {
+        $modified = strtotime( $revision->post_modified );
         $modified_gmt = strtotime( $revision->post_modified_gmt );
         $restore_link = wp_nonce_url(
@@ -89 +90 @@
                 'name'   => get_the_author_meta( 'display_name', $revision->post_author ),
             ),
-            'date'         => date_i18n( __( 'M j, Y @ G:i' ), $modified_gmt ),
-            'dateShort'    => date_i18n( _x( 'j M @ G:i', 'revision date short format' ), $modified_gmt ),
-            'dateUnix'     => $modified_gmt,
+            'date'         => date_i18n( __( 'M j, Y @ G:i' ), $modified ),
+            'dateShort'    => date_i18n( _x( 'j M @ G:i', 'revision date short format' ), $modified ),
             'timeAgo'      => sprintf( __( '%s ago' ), human_time_diff( $modified_gmt, $now_gmt ) ),
             'autosave'     => wp_is_post_autosave( $revision ),
@@ -100 +100 @@
 
     // Now, grab the initial diff
-    if ( ! $from ) { // Single mode
-        $initial_revisions = array_reverse( array_keys( array_slice( $revisions, array_search( $selected_revision_id, array_keys( $revisions ) ), 2, true ) ) );
-        $compare_two_mode = false;
-    } else { // Compare two
-        $compare_two_mode = true;
-        $initial_revisions = array( $from, $selected_revision_id );
-    }
+    $compare_two_mode = (bool) $from;
+    if ( ! $from ) // Single mode
+        $from = array_keys( array_slice( $revisions, array_search( $selected_revision_id, array_keys( $revisions ) ) - 1, 1, true ) )[0];
+
     $diffs = array( array(
-        'id' => $initial_revisions[0] . ':' . $initial_revisions[1],
-        'fields' => wp_get_revision_ui_diff( $post->ID, $initial_revisions[0], $initial_revisions[1] ),
+        'id' => $from . ':' . $selected_revision_id,
+        'fields' => wp_get_revision_ui_diff( $post->ID, $from, $selected_revision_id ),
     ));
 
@@ -121 +118 @@
         'baseUrl'          => parse_url( admin_url( 'revision.php' ), PHP_URL_PATH ),
         'compareTwoMode'   => absint( $compare_two_mode ), // Apparently booleans are not allowed
+        'revisionIds'      => array_keys( $revisions ),
     );
 }