Revisions: Ensure the global $post remains the same after revision is restored.

Because `wp_insert_post()` and `wp_transition_post_status()` are called during the process, plugins can unexpectedly modify `$post`.

Props markparnell, tofandel, archon810, SergeyBiryukov.
Fixes #46671.

git-svn-id: https://develop.svn.wordpress.org/trunk@48625 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov 2020-07-26 21:24:00 +00:00
parent 5c064bb139
commit 0dd00badb2

View File

@ -60,8 +60,18 @@ switch ( $action ) {
check_admin_referer( "restore-post_{$revision->ID}" ); check_admin_referer( "restore-post_{$revision->ID}" );
/*
* Ensure the global $post remains the same after revision is restored.
* Because wp_insert_post() and wp_transition_post_status() are called
* during the process, plugins can unexpectedly modify $post.
*/
$backup_global_post = clone $post;
wp_restore_post_revision( $revision->ID ); wp_restore_post_revision( $revision->ID );
// Restore the global $post as it was before.
$post = $backup_global_post;
$redirect = add_query_arg( $redirect = add_query_arg(
array( array(
'message' => 5, 'message' => 5,