Ticket #34560: 34560.16.diff

src/wp-admin/includes/meta-boxes.php

@@ -1437 +1437 @@
 
         $publish_callback_args = array( '__back_compat_meta_box' => true );
         if ( post_type_supports( $post_type, 'revisions' ) && 'auto-draft' !== $post->post_status ) {
-                $revisions = wp_get_post_revisions( $post->ID );
+                $revisions = wp_get_post_revisions( $post->ID, array( 'fields' => 'ids' ) );
 
                 // We should aim to show the revisions meta box 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 ),
+                                'revision_id'            => array_shift( $revisions ),
                                 '__back_compat_meta_box' => true,
                         );
                         add_meta_box( 'revisionsdiv', __( 'Revisions' ), 'post_revisions_meta_box', null, 'normal', 'core', array( '__back_compat_meta_box' => true ) );

src/wp-includes/revision.php

@@ -221 +221 @@
 /**
  * Retrieve the autosaved data of the specified post.
  *
- * Returns a post object containing the information that was autosaved for the
+ * Returns an object containing the information that was autosaved for the
  * specified post. If the optional $user_id is passed, returns the autosave for that user
  * otherwise returns the latest autosave.
  *
@@ -232 +232 @@
  * @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;
-                        }
+        $autosave_name = $post_id . '-autosave-v1';
+        $user_id_query = ( 0 !== $user_id ) ? "AND post_author = $user_id" : null;
+
+        // Construct 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 " . $user_id_query . '
+                ORDER BY post_date DESC
+                LIMIT 1';
+
+        $autosave = $wpdb->get_results(
+                $wpdb->prepare(
+                        $autosave_query,
+                        $post_id,
+                        $autosave_name
+                )
+        );
 
-                        return $revision;
-                }
+        if ( ! $autosave ) {
+                return false;
         }
 
-        return false;
+        return $autosave[0];
 }
 
 /**

tests/phpunit/tests/ajax/CustomizeManager.php

@@ -472 +472 @@
                 $this->assertTrue( $this->_last_response_parsed['success'] );
                 $this->assertEquals( 'draft', $this->_last_response_parsed['data']['changeset_status'] );
                 $autosave_revision = wp_get_post_autosave( $post_id );
-                $this->assertInstanceOf( 'WP_Post', $autosave_revision );
+                $this->assertInstanceOf( 'stdClass', $autosave_revision );
 
                 $this->assertContains( 'New Site Title', get_post( $post_id )->post_content );
                 $this->assertContains( 'Autosaved Site Title', $autosave_revision->post_content );
@@ -699 +699 @@
                 );
                 $this->assertNotWPError( $r );
                 $autosave_revision = wp_get_post_autosave( $wp_customize->changeset_post_id() );
-                $this->assertInstanceOf( 'WP_Post', $autosave_revision );
+                $this->assertInstanceOf( 'stdClass', $autosave_revision );
                 $this->assertContains( 'Foo', get_post( $wp_customize->changeset_post_id() )->post_content );
                 $this->assertContains( 'Bar', $autosave_revision->post_content );
 

tests/phpunit/tests/customize/manager.php

@@ -1891 +1891 @@
 
                 // Verify that autosave happened.
                 $autosave_revision = wp_get_post_autosave( $changeset_post_id, get_current_user_id() );
-                $this->assertInstanceOf( 'WP_Post', $autosave_revision );
+                $this->assertInstanceOf( 'stdClass', $autosave_revision );
                 $this->assertContains( 'Draft Title', get_post( $changeset_post_id )->post_content );
                 $this->assertContains( 'Autosave Title', $autosave_revision->post_content );
         }