Changeset 52602

Timestamp:

01/18/2022 11:45:40 PM (17 months ago)

Author:

peterwilsoncc

Message:

Script loader: Prevent DB errors during Multisite install.

Prevent the script loader from attempting to create nonces during the installation process for Multisite configurations.

Prior to this fix, multiple "Table does not exist" errors were thrown during installation if MULTISITE was defined in the wp-config.php file but the salt constants were not defined. Without the salts defined in PHP, WP was attempting to use the database fallbacks prior to table creation.

Props schlessera, johnbillion, hellofromTonya, audrasjb, costdev.
Fixes #54800.

File:

• trunk/src/wp-includes/script-loader.php (modified) (4 diffs)

trunk/src/wp-includes/script-loader.php

@@ -310 +310 @@
                 sprintf(
                     'wp.apiFetch.nonceMiddleware = wp.apiFetch.createNonceMiddleware( "%s" );',
-                    ( wp_installing() && ! is_multisite() ) ? '' : wp_create_nonce( 'wp_rest' )
+                    wp_installing() ? '' : wp_create_nonce( 'wp_rest' )
                 ),
                 'wp.apiFetch.use( wp.apiFetch.nonceMiddleware );',
@@ -712 +712 @@
         array(
             'root'          => esc_url_raw( get_rest_url() ),
-            'nonce'         => ( wp_installing() && ! is_multisite() ) ? '' : wp_create_nonce( 'wp_rest' ),
+            'nonce'         => wp_installing() ? '' : wp_create_nonce( 'wp_rest' ),
             'versionString' => 'wp/v2/',
         )
@@ -1110 +1110 @@
         array(
             'user_id' => $user_id,
-            'nonce'   => ( wp_installing() && ! is_multisite() ) ? '' : wp_create_nonce( 'reset-password-for-' . $user_id ),
+            'nonce'   => wp_installing() ? '' : wp_create_nonce( 'reset-password-for-' . $user_id ),
         )
     );
@@ -1336 +1336 @@
             '_wpUpdatesSettings',
             array(
-                'ajax_nonce' => wp_create_nonce( 'updates' ),
+                'ajax_nonce' => wp_installing() ? '' : wp_create_nonce( 'updates' ),
             )
         );