From c168ef72cc8da97cd6d10479f56dbf3795d8507f Mon Sep 17 00:00:00 2001
From: Aaron Campbell <aaron@xavisys.com>
Date: Sun, 28 Jul 2013 21:51:44 +0000
Subject: [PATCH] Disable ability to restore a revision if another user has the
 post lock

props adamsilverstein. Fixes #24829 for trunk.


git-svn-id: http://core.svn.wordpress.org/trunk@24827 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/revision.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/wp-admin/revision.php b/wp-admin/revision.php
index 7be2051699..c3196c635b 100644
--- a/wp-admin/revision.php
+++ b/wp-admin/revision.php
@@ -37,6 +37,10 @@ case 'restore' :
 		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 );
@@ -170,10 +174,13 @@ require_once( './admin-header.php' );
 					<span class="date">({{ data.attributes.dateShort }})</span>
 				</div>
 			<# if ( 'to' === data.type && data.attributes.restoreUrl ) { #>
-				<input 
-				<# if ( data.attributes.current ) { #>
+				<input  <?php if ( wp_check_post_lock( $post->ID ) ) { ?>
 					disabled="disabled"
-				<# } #>
+				<?php } else { ?>
+					<# if ( data.attributes.current ) { #>
+						disabled="disabled"
+					<# } #>
+				<?php } ?>
 				<# if ( data.attributes.autosave ) { #>
 					type="button" class="restore-revision button button-primary" value="<?php esc_attr_e( 'Restore This Autosave' ); ?>" />
 				<# } else { #>