Ticket #34560: 34560.diff

src/wp-admin/edit-form-advanced.php

@@ -217 +217 @@
 
 $publish_callback_args = null;
 if ( post_type_supports($post_type, 'revisions') && 'auto-draft' != $post->post_status ) {
-        $revisions = wp_get_post_revisions( $post_ID );
-
+        $revision_count = wp_get_post_revision_count( $post_id );
         // We should aim to show the revisions metabox only when there are revisions.
-        if ( count( $revisions ) > 1 ) {
-                reset( $revisions ); // Reset pointer for key()
-                $publish_callback_args = array( 'revisions_count' => count( $revisions ), 'revision_id' => key( $revisions ) );
+        if ( $revision_count && $revision_count > 1 ) {
+                $last_revision = wp_get_last_revision_id( $post_id );
+                $publish_callback_args = array( 'revisions_count' => $revision_count, 'revision_id' => $last_revision ? $last_revision: 0 );
                 add_meta_box('revisionsdiv', __('Revisions'), 'post_revisions_meta_box', null, 'normal', 'core');
         }
 }

src/wp-includes/revision.php

@@ -434 +434 @@
 }
 
 /**
+ * Return the count of revisions for a given post.
+ *
+ * @since 4.5.0
+ *
+ * @param int|WP_Post $post_id Optional. Post ID or WP_Post object. Default is global $post.
+ * @return int The count of revisions for this post, false if post invalid.
+ */
+function wp_get_post_revision_count( $post_id = 0 ) {
+        global $wpdb;
+
+        $post = get_post( $post_id );
+        if ( ! $post || empty( $post->ID ) ) {
+                return false;
+        }
+
+        $revision_count = intval(
+                $wpdb->get_var(
+                        $wpdb->prepare( "
+                                SELECT COUNT(1)
+                                FROM $wpdb->posts
+                                WHERE post_parent = %d
+                                AND   post_type   = 'revision'
+                                AND   post_status = 'inherit'",
+                        $post->ID
+                        )
+                )
+        );
+        return $revision_count;
+}
+
+/**
+ * Return the id of the last stored revision.
+ *
+ * @since 4.5.0
+ *
+ * @param int|WP_Post $post_id Optional. Post ID or WP_Post object. Default is global $post.
+ * @return int The id of the last stored revision for this post, false if post invalid.
+ */
+function wp_get_last_revision_id( $post_id = 0 ) {
+        global $wpdb;
+
+        $post = get_post( $post_id );
+        if ( ! $post || empty( $post->ID ) ) {
+                return false;
+        }
+
+        $last_revision_id = intval(
+                $wpdb->get_var(
+                        $wpdb->prepare( "
+                                SELECT ID, post_date
+                                FROM $wpdb->posts
+                                WHERE post_parent = %d
+                                AND   post_type   = 'revision'
+                                AND   post_status = 'inherit'
+                                ORDER BY post_date DESC, ID DESC
+                                LIMIT 1",
+                        $post->ID
+                        )
+                )
+        );
+        return $last_revision_id;
+}
+
+/**
  * Determine if revisions are enabled for a given post.
  *
  * @since 3.6.0