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

Timestamp:

07/18/2013 02:10:33 PM (13 years ago)

Author:

nacin

Message:

If two revisions were created at the same time, mark the one with the greater ID as current. Also avoid flagging autosaves as current. fixes #24782.

File:

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

trunk/wp-admin/includes/revision.php

@@ -117 +117 @@
                 }
 
+                $autosave = wp_is_post_autosave( $revision );
+                $current = ! $autosave && $revision->post_modified_gmt === $post->post_modified_gmt;
+                if ( $current && ! empty( $current_id ) ) {
+                        if ( $current_id < $revision->ID ) {
+                                $revisions[ $current_id ]['current'] = false;
+                                $current_id = $revision->ID;
+                        } else {
+                                $current = false;
+                        }
+                } elseif ( $current ) {
+                        $current_id = $revision->ID;
+                }
+
                 $revisions[ $revision->ID ] = array(
                         'id'         => $revision->ID,
@@ -124 +137 @@
                         '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 ),
-                        'current'    => $revision->post_modified_gmt === $post->post_modified_gmt,
+                        'autosave'   => $autosave,
+                        'current'    => $current,
                         'restoreUrl' => urldecode( $restore_link ),
                 );