Ticket #24572: wp_unset_post_lock.patch

wp-admin/includes/ajax-actions.php

@@ -1757 +1757 @@
         if ( $active_lock[1] != get_current_user_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 );
+        $unlock_result = wp_unset_post_lock( $post_id );
+
+        if( is_array( $unlock_result ) )
+                wp_die( 1 );
+        else
+                wp_die( 0 );
 }
 
 function wp_ajax_dismiss_wp_pointer() {

wp-admin/includes/post.php

@@ -1186 +1186 @@
         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_unset_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