Ticket #34560: 34560.10.diff

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 );
 
+
+        require_once( ABSPATH . 'wp-admin/includes/class-wp-revisions.php' );
+        $wp_revisions = WP_PostRevisions::getInstance( $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 ( $wp_revisions->revisions_count > 1 ) {
+                $publish_callback_args = array(
+                        'revisions_count' => $wp_revisions->revisions_count,
+                        'revision_id'     => $wp_revisions->last_revision_id,
+                );
                 add_meta_box('revisionsdiv', __('Revisions'), 'post_revisions_meta_box', null, 'normal', 'core');
         }
 }

wp-admin/includes/class-wp-revisions.php

@@ +1 @@
+<?php
+/**
+ * WP_Revisions helper class.
+ */
+class WP_PostRevisions {
+
+
+        /**
+         * WP_PostRevisions constructor.
+         * @param $post_id - ID of the post in question
+         *
+         * Keep the constructor hidden from public so it's only initialized as intended.
+         */
+        protected function __construct( $post_id ) {
+                $this->revisions_details = false;
+                $this->revisions_count = 0;
+                $this->last_revision_id = false;
+                $this->init( $post_id );
+        }
+
+        protected static $last_init_id = null;
+        protected static $last_instance = null;
+
+        public static function getInstance( $post_id ) {
+                if ( (self::$last_init_id === $post_id) && ( self::$last_instance instanceof WP_PostRevisions) ) {
+                        return self::$last_instance;
+                }
+                self::$last_init_id = $post_id;
+                self::$last_instance = new WP_PostRevisions( $post_id );
+
+                return self::$last_instance;
+        }
+
+        /**
+         * Initialize this instance of the revisions class
+         * @param $post_id
+         */
+        public function init( $post_id ) {
+                global  $wpdb;
+
+                // Grab all the revision details we need to the Post Edit screen.
+                $this->revisions_details = $wpdb->get_results(
+                        $wpdb->prepare( "
+                                SELECT   ID, post_author, post_date, post_date_gmt,
+                                             post_title, post_status, post_parent, post_modified, post_type
+                                FROM     $wpdb->posts
+                                WHERE    post_parent = %d
+                                AND      post_type   = 'revision'
+                                AND      post_status = 'inherit'
+                                ORDER BY post_date DESC, ID DESC",
+                                $post_id
+                        )
+                );
+
+                // Store the total revisions count.
+                $this->revisions_count = $wpdb->num_rows;
+
+                // Store the id of the last revision.
+                $this->last_revision_id = isset( $this->revisions_details[0] ) ? $this->revisions_details[0]->ID : false;
+        }
+
+        /**
+         * The number of revisions for the current object.
+         * @var int
+         */
+        public $revisions_count;
+
+        /**
+         * Details about the revisions.
+         * @var Array
+         */
+        public $revisions_details;
+
+        /**
+         * The id of the last revision.
+         * @var int
+         */
+        public $last_revision_id;
+}
+
+

wp-includes/post-template.php

@@ -1649 +1649 @@
  * @return string|false gravatar, user, i18n formatted datetimestamp or localized 'Current Revision'.
  */
 function wp_post_revision_title_expanded( $revision, $link = true ) {
-        if ( !$revision = get_post( $revision ) )
-                return $revision;
 
         if ( !in_array( $revision->post_type, array( 'post', 'page', 'revision' ) ) )
                 return false;
@@ -1662 +1660 @@
         $gravatar = get_avatar( $revision->post_author, 24 );
 
         $date = date_i18n( $datef, strtotime( $revision->post_modified ) );
-        if ( $link && current_user_can( 'edit_post', $revision->ID ) && $link = get_edit_post_link( $revision->ID ) )
+        if ( $link && $link = admin_url( sprintf( 'revision.php?revision=%d&action=edit', $revision->ID ) ) )
                 $date = "<a href='$link'>$date</a>";
 
         $revision_date_author = sprintf(
@@ -1710 +1708 @@
         if ( ! $post = get_post( $post_id ) )
                 return;
 
+        if ( ! current_user_can( 'read_post', $post->ID ) )
+                return;
+
         // $args array with (parent, format, right, left, type) deprecated since 3.6
         if ( is_array( $type ) ) {
                 $type = ! empty( $type['type'] ) ? $type['type']  : $type;
                 _deprecated_argument( __FUNCTION__, '3.6' );
         }
 
-        if ( ! $revisions = wp_get_post_revisions( $post->ID ) )
+        require_once( ABSPATH . 'wp-admin/includes/class-wp-revisions.php' );
+        $wp_revisions = WP_PostRevisions::getInstance( $post->ID );
+
+        if ( ! $revisions = $wp_revisions->revisions_details ) {
                 return;
+        }
 
         $rows = '';
         foreach ( $revisions as $revision ) {
-                if ( ! current_user_can( 'read_post', $revision->ID ) )
-                        continue;
-
                 $is_autosave = wp_is_post_autosave( $revision );
                 if ( ( 'revision' === $type && $is_autosave ) || ( 'autosave' === $type && ! $is_autosave ) )
                         continue;

wp-includes/revision.php

@@ -198 +198 @@
  * @return WP_Post|false The autosaved data or false on failure or when no autosave exists.
  */
 function wp_get_post_autosave( $post_id, $user_id = 0 ) {
-        $revisions = wp_get_post_revisions( $post_id, array( 'check_enabled' => false ) );
+        global $wpdb;
 
-        foreach ( $revisions as $revision ) {
-                if ( false !== strpos( $revision->post_name, "{$post_id}-autosave" ) ) {
-                        if ( $user_id && $user_id != $revision->post_author )
-                                continue;
+        // Contruct the autosave query.
+        $autosave_query = "
+                SELECT *
+                FROM $wpdb->posts
+                WHERE post_parent = %d
+                AND   post_type   = 'revision'
+                AND   post_status = 'inherit'
+                AND   post_name   = %s
+                AND   post_author = %s
+                LIMIT 1";
 
-                        return $revision;
-                }
+        $autosave_details = $wpdb->get_results(
+                $wpdb->prepare(
+                        $autosave_query,
+                        $post_id,
+                        $post_id . '-autosave-v1',
+                        ( 0 !== $user_id ) ? $user_id : get_current_user_id()
+                )
+        );
+
+        if ( empty( $autosave_details ) ) {
+                return false;
         }
 
-        return false;
+        return $autosave_details[0];
 }
 
 /**