Changeset 23981

Timestamp:

04/13/2013 12:41:15 AM (11 years ago)

Author:

azaozz

Message:

Post locks: make sure we never overwrite a draft when it's locked, clean up wp_ajax_autosave() and make wp-refresh-post-lock a bit more robust, see #23697

Location:

trunk/wp-admin

Files:

• includes/ajax-actions.php (modified) (5 diffs)
• js/post.js (modified) (1 diff)

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

@@ -1064 +1064 @@
 
     if ( ! empty( $_POST['autosave'] ) ) {
-        // Drafts and auto-drafts are just overwritten by autosave for the same user
-        if ( get_current_user_id() == $post->post_author && ( 'auto-draft' == $post->post_status || 'draft' == $post->post_status ) ) {
+        if ( ! wp_check_post_lock( $post->ID ) && get_current_user_id() == $post->post_author && ( 'auto-draft' == $post->post_status || 'draft' == $post->post_status ) ) {
+            // Drafts and auto-drafts are just overwritten by autosave for the same user if the post is not locked
             $id = edit_post();
-        } else { // Non drafts are not overwritten. The autosave is stored in a special post revision for each user.
+        } else {
+            // Non drafts or other users drafts are not overwritten. The autosave is stored in a special post revision for each user.
             $revision_id = wp_create_post_autosave( $post->ID );
             if ( is_wp_error($revision_id) )
@@ -1075 +1076 @@
         }
 
-        if ( is_wp_error($id) ) {
-            // is_wp_error($id) overwrites $data in WP_Ajax_Response but no point in doing wp_create_nonce('update-post_' . $id) below
-            // todo: Needs review. The errors generated in WP_Ajax_Response and parsed with wpAjax.parseAjaxResponse() haven't been used for many years.
-            $data = $id;
-            $id = 0;
-        } else {
+        // When is_wp_error($id), $id overwrites $data in WP_Ajax_Response
+        // todo: Needs review. The errors generated in WP_Ajax_Response and parsed with wpAjax.parseAjaxResponse() haven't been used for years.
+        if ( ! is_wp_error($id) ) {
             /* translators: draft saved date format, see http://php.net/date */
             $draft_saved_date_format = __('g:i:s a');
@@ -1099 +1097 @@
         $supplemental['replace-closedpostboxesnonce'] = wp_create_nonce('closedpostboxes');
         $supplemental['replace-_ajax_linking_nonce'] = wp_create_nonce( 'internal-linking' );
-        if ( $id )
-            $supplemental['replace-_wpnonce'] = wp_create_nonce('update-post_' . $id);
+        $supplemental['replace-_wpnonce'] = wp_create_nonce( 'update-post_' . $post->ID );
     }
 
@@ -1106 +1103 @@
         'what' => 'autosave',
         'id' => $id,
-        'data' => $id ? $data : '',
+        'data' => $data,
         'supplemental' => $supplemental
     ) );
@@ -2130 +2127 @@
 
         // make sure the right revision is the most recent
-        if ( $compare_two_mode && $right_revision->post_date < $left_revision->post_date ) {
+        if ( $compare_two_mode && $right_revision->ID < $left_revision->ID ) {
             $temp = $left_revision;
             $left_revision = $right_revision;

trunk/wp-admin/js/post.js

@@ -277 +277 @@
             wrap = $('#notification-dialog-wrap');
 
-            if ( ! wrap.is(':visible') ) {
-                autosave();
+            if ( wrap.length && ! wrap.is(':visible') ) {
+                if ( typeof autosave == 'function' )
+                    autosave();
 
                 if ( received.lock_error.avatar_src ) {