From a6cf8df9d10167a5bdbbe64cd419fc83846a2630 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Sun, 26 Jul 2020 20:43:02 +0000 Subject: [PATCH] Docs: Synchronize some comments in `wp-admin/revision.php`. See #49572. Built from https://develop.svn.wordpress.org/trunk@48624 git-svn-id: http://core.svn.wordpress.org/trunk@48386 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/revision.php | 7 ++++--- wp-includes/version.php | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/wp-admin/revision.php b/wp-admin/revision.php index b1590ee6d7..43cc266748 100644 --- a/wp-admin/revision.php +++ b/wp-admin/revision.php @@ -47,13 +47,13 @@ switch ( $action ) { break; } - // Restore if revisions are enabled or this is an autosave. + // Don't restore if revisions are disabled and this is not an autosave. if ( ! wp_revisions_enabled( $post ) && ! wp_is_post_autosave( $revision ) ) { $redirect = 'edit.php?post_type=' . $post->post_type; break; } - // Don't allow revision restore when post is locked. + // Don't restore if the post is locked. if ( wp_check_post_lock( $post->ID ) ) { break; } @@ -61,6 +61,7 @@ switch ( $action ) { check_admin_referer( "restore-post_{$revision->ID}" ); wp_restore_post_revision( $revision->ID ); + $redirect = add_query_arg( array( 'message' => 5, @@ -86,7 +87,7 @@ switch ( $action ) { break; } - // Revisions disabled and we're not looking at an autosave. + // Bail if revisions are disabled and this is not an autosave. if ( ! wp_revisions_enabled( $post ) && ! wp_is_post_autosave( $revision ) ) { $redirect = 'edit.php?post_type=' . $post->post_type; break; diff --git a/wp-includes/version.php b/wp-includes/version.php index 728fb02c40..b92332110b 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.5-beta3-48623'; +$wp_version = '5.5-beta3-48624'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.