Changeset 23661 for trunk/wp-admin/includes/ajax-actions.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/includes/ajax-actions.php (modified) (4 diffs)

trunk/wp-admin/includes/ajax-actions.php

@@ -1058 +1058 @@
 
     if ( $last = wp_check_post_lock( $post->ID ) ) {
+        // This will change after we have per-user autosaves
         $do_autosave = $do_lock = false;
 
@@ -1065 +1066 @@
 
         $supplemental['disable_autosave'] = 'disable';
-        $alert .= sprintf( __( '%s is currently editing this article. If you update it, you will overwrite the changes.' ), esc_html( $last_user_name ) );
     }
 
@@ -1093 +1093 @@
         else
             $id = $post->ID;
-    }
-
-    if ( $do_lock && empty( $_POST['auto_draft'] ) && $id && is_numeric( $id ) ) {
-        $lock_result = wp_set_post_lock( $id );
-        $supplemental['active-post-lock'] = implode( ':', $lock_result );
     }
 
@@ -1778 +1773 @@
         wp_die( 0 );
 
-    $new_lock = ( time() - apply_filters( 'wp_check_post_lock_window', AUTOSAVE_INTERVAL * 2 ) + 5 ) . ':' . $active_lock[1];
+    $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 );