Changeset 33468 for trunk/src/wp-admin/includes/ajax-actions.php

Timestamp:

07/28/2015 10:06:52 PM (11 years ago)

Author:

azaozz

Message:

Fix updating of nonces on the Edit Post screen after the log in expires and the user logs in again.
Props iseulde, azaozz. Fixes #33098.

File:

• trunk/src/wp-admin/includes/ajax-actions.php (modified) (2 diffs)

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

@@ -2572 +2572 @@
  */
 function wp_ajax_heartbeat() {
-        if ( empty( $_POST['_nonce'] ) )
-                wp_send_json_error();
-
-        $response = array();
-
-        if ( false === wp_verify_nonce( $_POST['_nonce'], 'heartbeat-nonce' ) ) {
-                // User is logged in but nonces have expired.
-                $response['nonces_expired'] = true;
-                wp_send_json($response);
-        }
+        if ( empty( $_POST['_nonce'] ) ) {
+                wp_send_json_error();
+        }
+
+        $response = $data = array();
+        $nonce_state = wp_verify_nonce( $_POST['_nonce'], 'heartbeat-nonce' );
 
         // screen_id is the same as $current_screen->id and the JS global 'pagenow'.
-        if ( ! empty($_POST['screen_id']) )
+        if ( ! empty( $_POST['screen_id'] ) ) {
                 $screen_id = sanitize_key($_POST['screen_id']);
-        else
+        } else {
                 $screen_id = 'front';
-
-        if ( ! empty($_POST['data']) ) {
+        }
+
+        if ( ! empty( $_POST['data'] ) ) {
                 $data = wp_unslash( (array) $_POST['data'] );
-
+        }
+
+        if ( 1 !== $nonce_state ) {
+                $response = apply_filters( 'wp_refresh_nonces', $response, $data, $screen_id );
+
+                if ( false === $nonce_state ) {
+                        // User is logged in but nonces have expired.
+                        $response['nonces_expired'] = true;
+                        wp_send_json( $response );
+                }
+        }
+
+        if ( ! empty( $data ) ) {
                 /**
                  * Filter the Heartbeat response received.
@@ -2629 +2638 @@
         $response['server_time'] = time();
 
-        wp_send_json($response);
+        wp_send_json( $response );
 }