Changeset 24209

Timestamp:

05/08/2013 10:52:55 PM (11 years ago)

Author:

azaozz

Message:

Post locks and autosave:

• Move nonces refreshing from autosave to lock checking.
• Do autosave only when there is something to save.

See #23295

Location:

trunk

Files:

• wp-admin/includes/ajax-actions.php (modified) (2 diffs)
• wp-admin/includes/misc.php (modified) (1 diff)
• wp-admin/js/post.js (modified) (4 diffs)
• wp-includes/js/autosave.js (modified) (3 diffs)

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

@@ -1039 +1039 @@
     define( 'DOING_AUTOSAVE', true );
 
-    $nonce_age = check_ajax_referer( 'autosave', 'autosavenonce' );
+    check_ajax_referer( 'autosave', 'autosavenonce' );
 
     $_POST['post_category'] = explode(",", $_POST['catslist']);
@@ -1089 +1089 @@
         else
             $id = $post->ID;
-    }
-
-    if ( $nonce_age == 2 ) {
-        $supplemental['replace-autosavenonce'] = wp_create_nonce('autosave');
-        $supplemental['replace-getpermalinknonce'] = wp_create_nonce('getpermalink');
-        $supplemental['replace-samplepermalinknonce'] = wp_create_nonce('samplepermalink');
-        $supplemental['replace-closedpostboxesnonce'] = wp_create_nonce('closedpostboxes');
-        $supplemental['replace-_ajax_linking_nonce'] = wp_create_nonce( 'internal-linking' );
-        $supplemental['replace-_wpnonce'] = wp_create_nonce( 'update-post_' . $post->ID );
     }
 

trunk/wp-admin/includes/misc.php

@@ -624 +624 @@
         }
 
+        if ( ! empty( $received['post_nonce'] ) && 2 === wp_verify_nonce( $received['post_nonce'], 'update-post_' . $post_id ) ) {
+            $send['update_nonces'] = array(
+                'replace-autosavenonce' => wp_create_nonce('autosave'),
+                'replace-getpermalinknonce' => wp_create_nonce('getpermalink'),
+                'replace-samplepermalinknonce' => wp_create_nonce('samplepermalink'),
+                'replace-closedpostboxesnonce' => wp_create_nonce('closedpostboxes'),
+                'replace-_ajax_linking_nonce' => wp_create_nonce( 'internal-linking' ),
+                'replace-_wpnonce' => wp_create_nonce( 'update-post_' . $post_id ),
+            );
+        }
+
         $response['wp-refresh-post-lock'] = $send;
     }

trunk/wp-admin/js/post.js

@@ -253 +253 @@
 
 $(document).on( 'heartbeat-send.refresh-lock', function( e, data ) {
-    var lock = $('#active_post_lock').val(), post_id = $('#post_ID').val(), send = {};
+    var lock = $('#active_post_lock').val(),
+        post_id = $('#post_ID').val(),
+        post_nonce = $('#_wpnonce').val(),
+        send = {};
 
     if ( !post_id )
@@ -262 +265 @@
     if ( lock )
         send['lock'] = lock;
+
+    if ( post_nonce )
+        send['post_nonce'] = post_nonce;
 
     data['wp-refresh-post-lock'] = send;
@@ -287 +293 @@
 
                     // Save the latest changes and disable
-                    autosave();
+                    if ( ! autosave() )
+                        window.onbeforeunload = null;
+
                     autosave = function(){};
                 }
@@ -301 +309 @@
         } else if ( received.new_lock ) {
             $('#active_post_lock').val( received.new_lock );
+        }
+
+        if ( received.update_nonces ) {
+            $.each( received.update_nonces, function( selector, value ) {
+                if ( selector.match(/^replace-/) )
+                    $( '#' + selector.replace('replace-', '') ).val( value );
+            });
         }
     }

trunk/wp-includes/js/autosave.js

@@ -255 +255 @@
 
 autosave = function() {
-    // (bool) is rich editor enabled and active
+    var post_data = wp.autosave.getPostData(),
+        doAutoSave = post_data.autosave,
+        successCallback;
+
     blockSave = true;
-    var rich = (typeof tinymce != "undefined") && tinymce.activeEditor && !tinymce.activeEditor.isHidden(),
-        post_data, doAutoSave, ed, origStatus, successCallback;
-
-    // Disable buttons until we know the save completed.
-    autosave_disable_buttons();
-
-    post_data = wp.autosave.getPostData();
-
-    // We always send the ajax request in order to keep the post lock fresh.
-    // This (bool) tells whether or not to write the post to the DB during the ajax request.
-    doAutoSave = post_data.autosave;
 
     // No autosave while thickbox is open (media buttons)
@@ -282 +274 @@
         jQuery(document).triggerHandler('wpcountwords', [ post_data["content"] ]);
     } else {
-        post_data['autosave'] = 0;
-    }
+        return false;
+    }
+
+    // Disable buttons until we know the save completed.
+    autosave_disable_buttons();
 
     if ( post_data["auto_draft"] == '1' ) {
@@ -298 +293 @@
         success: successCallback
     });
+
+    return true;
 }