Changeset 55869

Timestamp:

05/30/2023 02:32:25 PM (21 months ago)

Author:

SergeyBiryukov

Message:

Upgrade/Install: Avoid an extra database query in populate_network().

This moves the query for user ID of the new network's administrator closer to where the value is actually used.

Includes removing unnecessary get_userdata() call, as user ID is the only data needed here.

Follow-up to [12756], [35575], [43628].

Props nihar007, sakibmd, mukesh27, costdev, SergeyBiryukov.
Fixes #58423.

File:

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

trunk/src/wp-admin/includes/schema.php

@@ -1045 +1045 @@
     );
 
-    $site_user = get_userdata(
-        (int) $wpdb->get_var(
-            $wpdb->prepare(
-                "SELECT meta_value
-                FROM $wpdb->sitemeta
-                WHERE meta_key = %s AND site_id = %d",
-                'admin_user_id',
-                $network_id
-            )
-        )
-    );
-
     /*
      * When upgrading from single to multisite, assume the current site will
@@ -1080 +1068 @@
         );
         $current_site->blog_id = $wpdb->insert_id;
-        update_user_meta( $site_user->ID, 'source_domain', $domain );
-        update_user_meta( $site_user->ID, 'primary_blog', $current_site->blog_id );
+
+        $site_user_id = (int) $wpdb->get_var(
+            $wpdb->prepare(
+                "SELECT meta_value
+                FROM $wpdb->sitemeta
+                WHERE meta_key = %s AND site_id = %d",
+                'admin_user_id',
+                $network_id
+            )
+        );
+
+        update_user_meta( $site_user_id, 'source_domain', $domain );
+        update_user_meta( $site_user_id, 'primary_blog', $current_site->blog_id );
 
         // Unable to use update_network_option() while populating the network.