vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-05-21 03:34:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

REST API: Use wp_get_lastest_revision_id_and_total_count function in WP_REST_Posts_Controller class.

Browse Source 
Add new function called `wp_get_lastest_revision_id_and_total_count`, that performs an optimized query to get the last revision and total and use it in `WP_REST_Posts_Controller` class. 

Props Spacedmonkey, timothyblynjacobs, furi3r, peterwilsoncc.
Fixes #55857.

git-svn-id: https://develop.svn.wordpress.org/trunk@53759 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Jonny Harris
2022-07-22 13:22:04 +00:00
parent e822a9a209
commit 3506684f2a
4 changed files with 108 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php
View File

@@ -2024,8 +2024,8 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
}
if ( in_array( $post->post_type, array( 'post', 'page' ), true ) || post_type_supports( $post->post_type, 'revisions' ) ) {
$revisions = wp_get_post_revisions( $post->ID, array( 'fields' => 'ids' ) );
$revisions_count = count( $revisions );
$revision = wp_get_lastest_revision_id_and_total_count( $post->ID );
$revisions_count = ! is_wp_error( $revision ) ? $revision['count'] : 0;
$links['version-history'] = array(
'href' => rest_url( trailingslashit( $base ) . $post->ID . '/revisions' ),
@@ -2033,8 +2033,7 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
);
if ( $revisions_count > 0 ) {
$last_revision = array_shift( $revisions );
$last_revision = $revision['revision'];
$links['predecessor-version'] = array(
'href' => rest_url( trailingslashit( $base ) . $post->ID . '/revisions/' . $last_revision ),
'id' => $last_revision,

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

@@ -527,6 +527,57 @@ function wp_get_post_revisions( $post = 0, $args = null ) {
return $revisions;
}
/**
* Get latest revision and count of revisions for a post.
*
* @since 6.1.0
*
* @param int|WP_Post|null $post Optional. Post ID or WP_Post object. Default is global $post.
* @return WP_Error|array {
* Returns associative array with last revision and total count.
*
* @type int $revision The last revision post id or 0 if non existing.
* @type int $count The total count of revisions for $post_id.
* }
*/
function wp_get_lastest_revision_id_and_total_count( $post = null ) {
$post = get_post( $post );
if ( ! $post ) {
return new WP_Error( 'revision_error', __( 'Invalid post.' ) );
}
if ( ! wp_revisions_enabled( $post ) ) {
return new WP_Error( 'revision_error', __( 'Revisions not enabled.' ) );
}
$args = array(
'post_parent' => $post->ID,
'fields' => 'ids',
'post_type' => 'revision',
'post_status' => 'inherit',
'order' => 'DESC',
'orderby' => 'date ID',
'posts_per_page' => 1,
'ignore_sticky_posts' => true,
);
$revision_query = new WP_Query();
$revisions = $revision_query->query( $args );
if ( ! $revisions ) {
return array(
'revision' => 0,
'count' => 0,
);
}
return array(
'revision' => $revisions[0],
'count' => $revision_query->found_posts,
);
}
/**
* Returns the url for viewing and potentially restoring revisions of a given post.
*

51
tests/phpunit/tests/post/revisions.php
View File

@@ -655,6 +655,57 @@ class Tests_Post_Revisions extends WP_UnitTestCase {
$this->assertWPError( $revision );
}
/**
* Tests that wp_get_lastest_revision_id_and_total_count() returns last revision id and total count.
*
* @ticket 55857
* @dataProvider data_wp_get_post_revisions_url
*/
public function test_wp_get_last_revision_id_and_total_count( $revisions ) {
$post_id = self::factory()->post->create();
for ( $i = 0; $i < $revisions; ++$i ) {
wp_update_post(
array(
'ID' => $post_id,
'post_title' => 'Some Post',
)
);
}
$post_revisions = wp_get_post_revisions( $post_id );
$last_post_revision = current( $post_revisions );
$revision = wp_get_lastest_revision_id_and_total_count( $post_id );
$this->assertSame(
$last_post_revision->ID,
$revision['revision'],
'Failed asserting latest revision id.'
);
$this->assertSame(
count( $post_revisions ),
$revision['count'],
'Failed asserting total count of revision.'
);
}
/**
* Tests that wp_get_lastest_revision_id_and_total_count() when no revisions.
*
* @ticket 55857
*/
public function test_wp_get_last_revision_id_and_total_count_no_revisions() {
$revision = wp_get_lastest_revision_id_and_total_count( null );
$this->assertWPError( $revision, 'Invalid Post, non existing revisions.' );
$this->assertSame( $revision->get_error_message(), 'Invalid post.' );
add_filter( 'wp_revisions_to_keep', '__return_zero' );
$post_id = self::factory()->post->create();
$revision = wp_get_lastest_revision_id_and_total_count( $post_id );
$this->assertWPError( $revision, 'Revisions should be not enabled.' );
$this->assertSame( $revision->get_error_message(), 'Revisions not enabled.' );
}
/**
* Tests that wp_get_post_revisions_url() returns the revisions URL.
*

4
tests/phpunit/tests/rest-api/rest-posts-controller.php
View File

@@ -121,7 +121,9 @@ class WP_Test_REST_Posts_Controller extends WP_Test_REST_Post_Type_Controller_Te
}
public function save_posts_clauses( $orderby, $query ) {
array_push( $this->posts_clauses, $orderby );
if ( 'revision' !== $query->query_vars['post_type'] ) {
array_push( $this->posts_clauses, $orderby );
}
return $orderby;
}