Ticket #46107: 46107.diff

src/wp-admin/includes/misc.php

@@ -1082 +1082 @@
 function wp_refresh_heartbeat_nonces( $response ) {
         // Refresh the Rest API nonce.
         $response['rest_nonce'] = wp_create_nonce( 'wp_rest' );
-        // TEMPORARY: Compat with api-fetch library
-        $response['rest-nonce'] = $response['rest_nonce'];
 
         // Refresh the Heartbeat nonce.
         $response['heartbeat_nonce'] = wp_create_nonce( 'heartbeat-nonce' );

src/wp-includes/script-loader.php

@@ -521 +521 @@
 function wp_default_packages_inline_scripts( &$scripts ) {
         global $wp_locale;
 
+        if ( isset( $scripts->registered['wp-api-fetch'] ) ) {
+                $scripts->registered['wp-api-fetch']->deps[] = 'wp-hooks';
+        }
         $scripts->add_inline_script(
                 'wp-api-fetch',
                 sprintf(
-                        'wp.apiFetch.use( wp.apiFetch.createNonceMiddleware( "%s" ) );',
+                        implode(
+                                "\n",
+                                array(
+                                        '( function() {',
+                                        '       var nonceMiddleware = wp.apiFetch.createNonceMiddleware( "%s" );',
+                                        '       wp.apiFetch.use( nonceMiddleware );',
+                                        '       wp.hooks.addAction(',
+                                        '               "heartbeat.tick",',
+                                        '               "core/api-fetch/create-nonce-middleware",',
+                                        '               function( response ) {',
+                                        '                       if ( response[ "rest_nonce" ] ) {',
+                                        '                               nonceMiddleware.nonce = response[ "rest_nonce" ];',
+                                        '                       }',
+                                        '               }',
+                                        '       );',
+                                        '} )();',
+                                )
+                        ),
                         ( wp_installing() && ! is_multisite() ) ? '' : wp_create_nonce( 'wp_rest' )
                 ),
                 'after'