Ticket #24829: 24829.2.diff

wp-admin/revision.php

@@ -37 +37 @@
                 break;
         }
 
+        // Don't allow revision restore when post is locked
+        if ( wp_check_post_lock( $post->ID ) )
+                break;
+
         check_admin_referer( "restore-post_{$revision->ID}" );
 
         wp_restore_post_revision( $revision->ID );
@@ -218 +222 @@
                                 </div>
                 <# } #>
                 <# if ( data.to.attributes.restoreUrl ) { #>
-                        <input 
+                        <input <?php if ( wp_check_post_lock( $post->ID ) ) echo 'disabled="disabled" '; ?>
                         <# if ( data.to.attributes.current ) { #>
                                 disabled="disabled"
                         <# } #>