Changeset 23661 for trunk/wp-admin/post.php

Timestamp:

03/12/2013 03:22:30 AM (12 years ago)

Author:

azaozz

Message:

Check post locks with heartbeat and display modal notifications when a post is locked or a user takes over editing, props dh-shredder, see #23697

File:

• trunk/wp-admin/post.php (modified) (4 diffs)

trunk/wp-admin/post.php

@@ -148 +148 @@
         wp_die( __('You can’t edit this item because it is in the Trash. Please restore it and try again.') );
 
+    if ( !empty( $_GET['get-post-lock'] ) ) {
+        wp_set_post_lock( $post_id );
+        wp_redirect( get_edit_post_link( $post_id, 'url' ) );
+        exit();
+    }
+
     $post_type = $post->post_type;
     if ( 'post' == $post_type ) {
@@ -166 +172 @@
     }
 
-    if ( $last = wp_check_post_lock( $post->ID ) ) {
-        add_action('admin_notices', '_admin_notice_post_locked' );
-    } else {
+    if ( ! wp_check_post_lock( $post->ID ) ) {
         $active_post_lock = wp_set_post_lock( $post->ID );
 
@@ -174 +178 @@
             wp_enqueue_script('autosave');
     }
+
+    add_action( 'admin_footer', '_admin_notice_post_locked' );
 
     $title = $post_type_object->labels->edit_item;
@@ -217 +223 @@
     if ( !current_user_can($post_type_object->cap->delete_post, $post_id) )
         wp_die( __('You are not allowed to move this item to the Trash.') );
+
+    if ( $user_id = wp_check_post_lock( $post_id ) ) {
+        $user = get_userdata( $user_id );
+        wp_die( sprintf( __( 'You cannot move this item to the Trash. %s is currently editing.' ), $user->display_name ) );
+    }
 
     if ( ! wp_trash_post($post_id) )