Ticket #46671: 46671.3.diff

src/wp-admin/revision.php

@@ -42 +42 @@
                         break;
                 }
 
-                $post = get_post( $revision->post_parent );
-                if ( ! $post ) {
+                $parent = get_post( $revision->post_parent );
+                if ( ! $parent ) {
                         break;
                 }
 
                 // 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;
+                if ( ! wp_revisions_enabled( $parent ) && ! wp_is_post_autosave( $revision ) ) {
+                        $redirect = 'edit.php?post_type=' . $parent->post_type;
                         break;
                 }
 
                 // Don't restore if the post is locked.
-                if ( wp_check_post_lock( $post->ID ) ) {
+                if ( wp_check_post_lock( $parent->ID ) ) {
                         break;
                 }
 
                 check_admin_referer( "restore-post_{$revision->ID}" );
 
+                // Set up global post variable for the use of any functions hooked into restore process.
+                $post           = clone $parent;
+                $wp_query->post = $post;
+
                 wp_restore_post_revision( $revision->ID );
 
                 $redirect = add_query_arg(
@@ -67 +71 @@
                                 'message'  => 5,
                                 'revision' => $revision->ID,
                         ),
-                        get_edit_post_link( $post->ID, 'url' )
+                        get_edit_post_link( $parent->ID, 'url' )
                 );
                 break;
         case 'view':
@@ -78 +82 @@
                         break;
                 }
 
-                $post = get_post( $revision->post_parent );
-                if ( ! $post ) {
+                $parent = get_post( $revision->post_parent );
+                if ( ! $parent ) {
                         break;
                 }
 
@@ -88 +92 @@
                 }
 
                 // 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;
+                if ( ! wp_revisions_enabled( $parent ) && ! wp_is_post_autosave( $revision ) ) {
+                        $redirect = 'edit.php?post_type=' . $parent->post_type;
                         break;
                 }
 
-                $post_edit_link = get_edit_post_link();
-                $post_title     = '<a href="' . $post_edit_link . '">' . _draft_or_post_title() . '</a>';
+                $post_edit_link = get_edit_post_link( $parent );
+                $post_title     = '<a href="' . $post_edit_link . '">' . _draft_or_post_title( $parent ) . '</a>';
                 /* translators: %s: Post title. */
                 $h1             = sprintf( __( 'Compare Revisions of &#8220;%s&#8221;' ), $post_title );
                 $return_to_post = '<a href="' . $post_edit_link . '">' . __( '&larr; Return to editor' ) . '</a>';
@@ -105 +109 @@
 }
 
 // Empty post_type means either malformed object found, or no valid parent was found.
-if ( ! $redirect && empty( $post->post_type ) ) {
+if ( ! $redirect && empty( $parent->post_type ) ) {
         $redirect = 'edit.php';
 }
 
@@ -115 +119 @@
 }
 
 // This is so that the correct "Edit" menu item is selected.
-if ( ! empty( $post->post_type ) && 'post' != $post->post_type ) {
-        $parent_file = 'edit.php?post_type=' . $post->post_type;
+if ( ! empty( $parent->post_type ) && 'post' != $parent->post_type ) {
+        $parent_file = 'edit.php?post_type=' . $parent->post_type;
 } else {
         $parent_file = 'edit.php';
 }
@@ -123 +127 @@
 $submenu_file = $parent_file;
 
 wp_enqueue_script( 'revisions' );
-wp_localize_script( 'revisions', '_wpRevisionsSettings', wp_prepare_revisions_for_js( $post, $revision_id, $from ) );
+wp_localize_script( 'revisions', '_wpRevisionsSettings', wp_prepare_revisions_for_js( $parent, $revision_id, $from ) );
 
 /* Revisions Help Tab */
 
@@ -157 +161 @@
         <?php echo $return_to_post; ?>
 </div>
 <?php
+// Set up global post variable for wp_print_revision_templates().
+$post = clone $parent;
+
 wp_print_revision_templates();
 
 require_once ABSPATH . 'wp-admin/admin-footer.php';