sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revisions: Restore the return value of wp_get_post_autosave() to the documented type of WP_Post for backward compatibility.

Browse Source 
Follow-up to [48422].

See #34560.

git-svn-id: https://develop.svn.wordpress.org/trunk@48438 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov 2020-07-11 21:13:56 +00:00
parent 8f39f8ebb7
commit d5cfd5c63c
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/wp-includes/revision.php
View File

@ -221,9 +221,9 @@ function wp_save_post_revision( $post_id ) {
/**
* Retrieve the autosaved data of the specified post.
*
* 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.
* Returns a post object with 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.
*
* @since 2.6.0
*
@ -237,7 +237,7 @@ function wp_get_post_autosave( $post_id, $user_id = 0 ) {
$autosave_name = $post_id . '-autosave-v1';
$user_id_query = ( 0 !== $user_id ) ? "AND post_author = $user_id" : null;
// Construct the autosave query
// Construct the autosave query.
$autosave_query = "
SELECT *
FROM $wpdb->posts
@ -260,7 +260,7 @@ function wp_get_post_autosave( $post_id, $user_id = 0 ) {
return false;
}
return $autosave[0];
return get_post( $autosave[0] );
}
/**

4
tests/phpunit/tests/ajax/CustomizeManager.php
View File

@ -472,7 +472,7 @@ class Tests_Ajax_CustomizeManager extends WP_Ajax_UnitTestCase {
$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( 'stdClass', $autosave_revision );
$this->assertInstanceOf( 'WP_Post', $autosave_revision );
$this->assertContains( 'New Site Title', get_post( $post_id )->post_content );
$this->assertContains( 'Autosaved Site Title', $autosave_revision->post_content );
@ -699,7 +699,7 @@ class Tests_Ajax_CustomizeManager extends WP_Ajax_UnitTestCase {
);
$this->assertNotWPError( $r );
$autosave_revision = wp_get_post_autosave( $wp_customize->changeset_post_id() );
$this->assertInstanceOf( 'stdClass', $autosave_revision );
$this->assertInstanceOf( 'WP_Post', $autosave_revision );
$this->assertContains( 'Foo', get_post( $wp_customize->changeset_post_id() )->post_content );
$this->assertContains( 'Bar', $autosave_revision->post_content );

2
tests/phpunit/tests/customize/manager.php
View File

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