From 8417706532478f38f679ac76e337ab83dffc89fd Mon Sep 17 00:00:00 2001
From: Dominik Schilling <dominikschilling+git@gmail.com>
Date: Tue, 4 Aug 2015 04:56:06 +0000
Subject: [PATCH] Heartbeat: Ensure post locks are released.

Merge of [33542] to the 3.9 branch.
Built from https://develop.svn.wordpress.org/branches/3.9@33546


git-svn-id: http://core.svn.wordpress.org/branches/3.9@33513 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/post.php | 2 +-
 wp-admin/post.php          | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/wp-admin/includes/post.php b/wp-admin/includes/post.php
index 322fcf33b7..e355719e79 100644
--- a/wp-admin/includes/post.php
+++ b/wp-admin/includes/post.php
@@ -1469,7 +1469,7 @@ function _admin_notice_post_locked() {
 		// Allow plugins to prevent some users overriding the post lock
 		if ( $override ) {
 			?>
-			<a class="button button-primary wp-tab-last" href="<?php echo esc_url( add_query_arg( 'get-post-lock', '1', get_edit_post_link( $post->ID, 'url' ) ) ); ?>"><?php _e('Take over'); ?></a>
+			<a class="button button-primary wp-tab-last" href="<?php echo esc_url( add_query_arg( 'get-post-lock', '1', wp_nonce_url( get_edit_post_link( $post->ID, 'url' ), 'lock-post_' . $post->ID ) ) ); ?>"><?php _e('Take over'); ?></a>
 			<?php
 		}
 
diff --git a/wp-admin/post.php b/wp-admin/post.php
index eb0d987947..f52f33b62e 100644
--- a/wp-admin/post.php
+++ b/wp-admin/post.php
@@ -160,6 +160,7 @@ case 'edit':
 		wp_die( __( 'You can&#8217;t edit this item because it is in the Trash. Please restore it and try again.' ) );
 
 	if ( ! empty( $_GET['get-post-lock'] ) ) {
+		check_admin_referer( 'lock-post_' . $post_id );
 		wp_set_post_lock( $post_id );
 		wp_redirect( get_edit_post_link( $post_id, 'url' ) );
 		exit();