Revision restoring redirect issue when using custom wp_query inside shortcodes

[vendetta90]

Using a custom WP_Query inside page content shortcodes leads to weird "revisions restoring" behavior which is redirecting to improper page id. However the page content is restored correctly. Have found this lines 55, 56 in revision.php

wp_restore_post_revision( $revision->ID ); 
$redirect = add_query_arg( array( 'message' => 5, 'revision' => $revision->ID ), get_edit_post_link( $post->ID, 'url' ) )

While wp_restore_post_revision( $revision->ID ) returns a correct post_id, the redirect is made to get_edit_post_link( $post->ID, 'url' ) and $post->ID may be broken by custom wp_query loop. Why not using wp_restore_post_revision( $revision->ID ) returned result to perform a correct redirect?

[vendetta90]

Fixed that using

add_action( 'wp_restore_post_revision', 'fix_revisions', 10, 2 );

function fix_revisions( $post_id, $revision ) {
        global $post;
        $post->ID = $post_id;
}

[Breno Alves]

Nice catch @vendetta90, I was facing the same issue by using a page builder component that loops in a custom post type.