Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-01-03 15:08:10 +01:00
Code Issues Projects Releases Wiki Activity

Revisions: Correct the function name for retrieving the last revision ID and total count.

Browse Source 
Includes:
* Renaming the function to `wp_get_last_revision_id_and_total_count()`.
* Making the default value for `$post` consistent with `wp_get_post_revisions()`.
* Making `WP_Error` codes more specific and using them in test assertions.
* Adjusting the function description per the documentation standards.

Follow-up to [53759].

Props JustinSainton, SergeyBiryukov.
See #55857.
Built from https://develop.svn.wordpress.org/trunk@53769


git-svn-id: http://core.svn.wordpress.org/trunk@53328 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2022-07-23 15:42:16 +00:00
parent 729ab2c971
commit e5fca86316
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2026,7 +2026,7 @@ 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' ) ) { if ( in_array( $post->post_type, array( 'post', 'page' ), true ) || post_type_supports( $post->post_type, 'revisions' ) ) {
$revision = wp_get_lastest_revision_id_and_total_count( $post->ID ); $revision = wp_get_last_revision_id_and_total_count( $post->ID );
$revisions_count = ! is_wp_error( $revision ) ? $revision['count'] : 0; $revisions_count = ! is_wp_error( $revision ) ? $revision['count'] : 0;
$links['version-history'] = array( $links['version-history'] = array(
@ -2036,6 +2036,7 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
if ( $revisions_count > 0 ) { if ( $revisions_count > 0 ) {
$last_revision = $revision['revision']; $last_revision = $revision['revision'];
$links['predecessor-version'] = array( $links['predecessor-version'] = array(
'href' => rest_url( trailingslashit( $base ) . $post->ID . '/revisions/' . $last_revision ), 'href' => rest_url( trailingslashit( $base ) . $post->ID . '/revisions/' . $last_revision ),
'id' => $last_revision, 'id' => $last_revision,

16
wp-includes/revision.php
View File

@ -528,27 +528,27 @@ function wp_get_post_revisions( $post = 0, $args = null ) {
} }
/** /**
* Get latest revision and count of revisions for a post. * Returns the latest revision ID and count of revisions for a post.
* *
* @since 6.1.0 * @since 6.1.0
* *
* @param int|WP_Post|null $post Optional. Post ID or WP_Post object. Default is global $post. * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global $post.
* @return WP_Error|array { * @return WP_Error|array {
* Returns associative array with last revision and total count. * Returns associative array with last revision ID and total count.
* *
* @type int $revision The last revision post id or 0 if non existing. * @type int $revision The last revision post ID or 0 if no revisions exist.
* @type int $count The total count of revisions for $post_id. * @type int $count The total count of revisions for the given post.
* } * }
*/ */
function wp_get_lastest_revision_id_and_total_count( $post = null ) { function wp_get_last_revision_id_and_total_count( $post = 0 ) {
$post = get_post( $post ); $post = get_post( $post );
if ( ! $post ) { if ( ! $post ) {
return new WP_Error( 'revision_error', __( 'Invalid post.' ) ); return new WP_Error( 'invalid_post', __( 'Invalid post.' ) );
} }
if ( ! wp_revisions_enabled( $post ) ) { if ( ! wp_revisions_enabled( $post ) ) {
return new WP_Error( 'revision_error', __( 'Revisions not enabled.' ) ); return new WP_Error( 'revisions_not_enabled', __( 'Revisions not enabled.' ) );
} }
$args = array( $args = array(

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '6.1-alpha-53768'; $wp_version = '6.1-alpha-53769';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.