Changeset 44805 for trunk/src/wp-includes/ms-site.php

Timestamp:

03/07/2019 03:33:25 AM (7 years ago)

Author:

jeremyfelt

Message:

Multisite: Ensure wpmu_new_blog hook receives expected data in $meta.

Restores public, archived, mature, spam, deleted, lang_id, and WPLANG to the $meta data passed to wpmu_new_blog. This hook was deprecated in 5.1.0, but code using it still relies on this data.

Props david.binda, pbiron.
Fixes #46351.

File:

• trunk/src/wp-includes/ms-site.php (modified) (3 diffs)

trunk/src/wp-includes/ms-site.php

@@ -53 +53 @@
     );
 
+    $prepared_data = wp_prepare_site_data( $data, $defaults );
+    if ( is_wp_error( $prepared_data ) ) {
+        return $prepared_data;
+    }
+
+    if ( false === $wpdb->insert( $wpdb->blogs, $prepared_data ) ) {
+        return new WP_Error( 'db_insert_error', __( 'Could not insert site into the database.' ), $wpdb->last_error );
+    }
+
+    $new_site = get_site( $wpdb->insert_id );
+
+    if ( ! $new_site ) {
+        return new WP_Error( 'get_site_error', __( 'Could not retrieve site data.' ) );
+    }
+
+    clean_blog_cache( $new_site );
+
+    /**
+     * Fires once a site has been inserted into the database.
+     *
+     * @since 5.1.0
+     *
+     * @param WP_Site $new_site New site object.
+     */
+    do_action( 'wp_insert_site', $new_site );
+
     // Extract the passed arguments that may be relevant for site initialization.
     $args = array_diff_key( $data, $defaults );
@@ -59 +85 @@
     }
 
-    $data = wp_prepare_site_data( $data, $defaults );
-    if ( is_wp_error( $data ) ) {
-        return $data;
-    }
-
-    if ( false === $wpdb->insert( $wpdb->blogs, $data ) ) {
-        return new WP_Error( 'db_insert_error', __( 'Could not insert site into the database.' ), $wpdb->last_error );
-    }
-
-    $new_site = get_site( $wpdb->insert_id );
-
-    if ( ! $new_site ) {
-        return new WP_Error( 'get_site_error', __( 'Could not retrieve site data.' ) );
-    }
-
-    clean_blog_cache( $new_site );
-
-    /**
-     * Fires once a site has been inserted into the database.
-     *
-     * @since 5.1.0
-     *
-     * @param WP_Site $new_site New site object.
-     */
-    do_action( 'wp_insert_site', $new_site );
-
     /**
      * Fires when a site's initialization routine should be executed.
@@ -99 +99 @@
         $user_id = ! empty( $args['user_id'] ) ? $args['user_id'] : 0;
         $meta    = ! empty( $args['options'] ) ? $args['options'] : array();
+
+        // WPLANG was passed with `$meta` to the `wpmu_new_blog` hook prior to 5.1.0.
+        if ( ! array_key_exists( 'WPLANG', $meta ) ) {
+            $meta['WPLANG'] = get_network_option( $new_site->network_id, 'WPLANG' );
+        }
+
+        // Rebuild the data expected by the `wpmu_new_blog` hook prior to 5.1.0 using whitelisted keys.
+        // The `$site_data_whitelist` matches the one used in `wpmu_create_blog()`.
+        $site_data_whitelist = array( 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id' );
+        $meta = array_merge( array_intersect_key( $data, array_flip( $site_data_whitelist ) ), $meta );
 
         /**