Ticket #24572: 24572.patch

wp-admin/includes/ajax-actions.php

@@ -1744 +1744 @@
 function wp_ajax_wp_remove_post_lock() {
         if ( empty( $_POST['post_ID'] ) || empty( $_POST['active_post_lock'] ) )
                 wp_die( 0 );
+
         $post_id = (int) $_POST['post_ID'];
         if ( ! $post = get_post( $post_id ) )
                 wp_die( 0 );
@@ -1753 +1754 @@
         if ( ! current_user_can( 'edit_post', $post_id ) )
                 wp_die( -1 );
 
-        $active_lock = array_map( 'absint', explode( ':', $_POST['active_post_lock'] ) );
-        if ( $active_lock[1] != get_current_user_id() )
+        if ( ! wp_remove_post_lock( $post_id ) )
                 wp_die( 0 );
 
-        $new_lock = ( time() - apply_filters( 'wp_check_post_lock_window', 120 ) + 5 ) . ':' . $active_lock[1];
-        update_post_meta( $post_id, '_edit_lock', $new_lock, implode( ':', $active_lock ) );
         wp_die( 1 );
 }
 

wp-admin/includes/post.php

@@ -1176 +1176 @@
 }
 
 /**
- * Mark the post as currently being edited by the current user
+ * Mark the post as currently being edited by the current user.
  *
  * @since 2.5.0
  *
@@ -1185 +1185 @@
  *      an array of the lock time and the user ID.
  */
 function wp_set_post_lock( $post_id ) {
-        if ( !$post = get_post( $post_id ) )
+        if ( ! $post = get_post( $post_id ) )
                 return false;
-        if ( 0 == ($user_id = get_current_user_id()) )
+
+        if ( 0 == ( $user_id = get_current_user_id() ) )
                 return false;
 
         $now = time();
         $lock = "$now:$user_id";
 
         update_post_meta( $post->ID, '_edit_lock', $lock );
+
         return array( $now, $user_id );
 }
 
 /**
+ * Mark the post as no longer being edited by the current user by setting the
+ * last lock timestamp to a time in the recent past.
+ *
+ * @since 3.6.0
+ *
+ * @param int $post_id ID of the post to being edited
+ * @return bool|array Returns false if the post doesn't exist of there is no current user, or
+ *      an array of the last lock time and the user ID.
+ */
+function wp_remove_post_lock( $post_id ) {
+        if ( ! $post = get_post( $post_id ) )
+                return false;
+
+        if ( 0 == ( $user_id = get_current_user_id() ) )
+                return false;
+
+        // Set post lock time to a time in recent past
+        $then = time() - apply_filters( 'wp_check_post_lock_window', 120 ) + 5;
+        $removal_lock = "$then:$user_id";
+
+        update_post_meta( $post->ID, '_edit_lock', $removal_lock );
+
+        return array( $then, $user_id );
+}
+
+/**
  * Outputs the HTML for the notice to say that someone else is editing or has taken over editing of this post.
  *
  * @since 2.8.5
@@ -1213 +1241 @@
                 $locked = false;
         }
 
-        if ( $locked && ( $sendback = wp_get_referer() ) && 
+        if ( $locked && ( $sendback = wp_get_referer() ) &&
                 false === strpos( $sendback, 'post.php' ) && false === strpos( $sendback, 'post-new.php' ) ) {
 
                 $sendback_text = __('Go back');