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

Timestamp:

07/24/2013 06:08:14 AM (12 years ago)

Author:

nacin

Message:

Revisions changes.

• Eliminates the bloated Revisions meta box in favor of 'Revisions: #' in the publish box.
• Adds ability to compare autosave to current post, when revisions are disabled.
• Makes autosaves stand out visually, including "Restore This Autosave".

Also:

• Adds missing capability check for restoring a revision.
• When no revision matches the post's current modified time, avoid marking an autosave as 'current'.
• Fixes wp_get_post_autosave() to return an autosave even when revisions are disabled.
• Add 'check_enabled' arg to wp_get_post_revisions(); false avoids the wp_revisions_enabled() check.
• Adds a responsive slider that is narrower for fewer versions. props markjaquith.

see #24804.

File:

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

trunk/wp-admin/includes/revision.php

@@ -33 +33 @@
 
     // If comparing revisions, make sure we're dealing with the right post parent.
-    if ( $compare_from && $compare_from->post_parent !== $post->ID )
-        return false;
-    if ( $compare_to->post_parent !== $post->ID )
+    // The parent post may be a 'revision' when revisions are disabled and we're looking at autosaves.
+    if ( $compare_from && $compare_from->post_parent !== $post->ID && $compare_from->ID !== $post->ID )
+        return false;
+    if ( $compare_to->post_parent !== $post->ID && $compare_to->ID !== $post->ID )
         return false;
 
@@ -92 +93 @@
     $now_gmt = time();
 
-    $revisions = wp_get_post_revisions( $post->ID, array( 'order' => 'ASC' ) );
+    $revisions = wp_get_post_revisions( $post->ID, array( 'order' => 'ASC', 'check_enabled' => false ) );
+    // If revisions are disabled, we only want autosaves and the current post.
+    if ( ! wp_revisions_enabled( $post ) ) {
+        foreach ( $revisions as $revision_id => $revision ) {
+            if ( ! wp_is_post_autosave( $revision ) )
+                unset( $revisions[ $revision_id ] );
+        }
+        $revisions = array( $post->ID => $post ) + $revisions;
+    }
+
     $show_avatars = get_option( 'show_avatars' );
 
     cache_users( wp_list_pluck( $revisions, 'post_author' ) );
+
+    $can_restore = current_user_can( 'edit_post', $post->ID );
 
     foreach ( $revisions as $revision ) {
         $modified = strtotime( $revision->post_modified );
         $modified_gmt = strtotime( $revision->post_modified_gmt );
-        $restore_link = str_replace( '&', '&', wp_nonce_url(
-            add_query_arg(
-                array( 'revision' => $revision->ID,
-                    'action' => 'restore' ),
-                    admin_url( 'revision.php' )
-            ),
-            "restore-post_{$revision->ID}"
-        ) );
+        if ( $can_restore ) {
+            $restore_link = str_replace( '&', '&', wp_nonce_url(
+                add_query_arg(
+                    array( 'revision' => $revision->ID,
+                        'action' => 'restore' ),
+                        admin_url( 'revision.php' )
+                ),
+                "restore-post_{$revision->ID}"
+            ) );
+        }
 
         if ( ! isset( $authors[ $revision->post_author ] ) ) {
@@ -117 +131 @@
         }
 
-        $autosave = wp_is_post_autosave( $revision );
+        $autosave = (bool) wp_is_post_autosave( $revision );
         $current = ! $autosave && $revision->post_modified_gmt === $post->post_modified_gmt;
         if ( $current && ! empty( $current_id ) ) {
+            // If multiple revisions have the same post_modified_gmt, highest ID is current.
             if ( $current_id < $revision->ID ) {
                 $revisions[ $current_id ]['current'] = false;
@@ -139 +154 @@
             'autosave'   => $autosave,
             'current'    => $current,
-            'restoreUrl' => urldecode( $restore_link ),
+            'restoreUrl' => $can_restore ? $restore_link : false,
         );
     }
@@ -145 +160 @@
     // If a post has been saved since the last revision (no revisioned fields were changed)
     // we may not have a "current" revision. Mark the latest revision as "current".
-    if ( empty( $current_id ) )
-        $revisions[ $revision->ID ]['current'] = true;
+    if ( empty( $current_id ) ) {
+        if ( $revisions[ $revision->ID ]['autosave'] ) {
+            $revision = end( $revisions );
+            while ( $revision['autosave'] ) {
+                $revision = prev( $revisions );
+            }
+            $current_id = $revision['id'];
+        } else {
+            $current_id = $revision->ID;
+        }
+        $revisions[ $current_id ]['current'] = true;
+    }
 
     // Now, grab the initial diff