Changeset 24528 for trunk/wp-admin/includes/misc.php

Timestamp:

06/29/2013 01:31:44 AM (13 years ago)

Author:

azaozz

Message:

Nonce refresh:

• Update the heartbeat nonce when refreshing nonces on the Edit Post screen.
• After a user logs in from the auth-check dialog, speed up heatrbeat to check/refresh nonces on the Edit Post screen.
• Speeding up heartbeat: bring back the setting how long it should last (how many ticks).
• Add 'heartbeat-nonces-expired' jQuery event when nonces have expired and the user is logged in.

See #23295, see #23216.

File:

• trunk/wp-admin/includes/misc.php (modified) (1 diff)

trunk/wp-admin/includes/misc.php

@@ -640 +640 @@
         if ( array_key_exists( 'wp-refresh-post-nonces', $data ) ) {
                 $received = $data['wp-refresh-post-nonces'];
+                $response['wp-refresh-post-nonces'] = array( 'check' => 1 );
 
                 if ( ! $post_id = absint( $received['post_id'] ) )
                         return $response;
 
-                if ( ! current_user_can('edit_post', $post_id) )
+                if ( ! current_user_can( 'edit_post', $post_id ) || empty( $received['post_nonce'] ) )
                         return $response;
 
-                if ( ! empty( $received['post_nonce'] ) && 2 === wp_verify_nonce( $received['post_nonce'], 'update-post_' . $post_id ) ) {
+                if ( 2 === wp_verify_nonce( $received['post_nonce'], 'update-post_' . $post_id ) ) {
                         $response['wp-refresh-post-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 ),
+                                'replace' => array(
+                                        'autosavenonce' => wp_create_nonce('autosave'),
+                                        'getpermalinknonce' => wp_create_nonce('getpermalink'),
+                                        'samplepermalinknonce' => wp_create_nonce('samplepermalink'),
+                                        'closedpostboxesnonce' => wp_create_nonce('closedpostboxes'),
+                                        '_ajax_linking_nonce' => wp_create_nonce( 'internal-linking' ),
+                                        '_wpnonce' => wp_create_nonce( 'update-post_' . $post_id ),
+                                ),
+                                'heartbeatNonce' => wp_create_nonce( 'heartbeat-nonce' ),
                         );
                 }