Ticket #58423: 58423.diff

src/wp-admin/includes/schema.php

@@ -1044 +1044 @@
                 )
         );
 
-        $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
-                        )
+        $site_user = (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
                 )
         );
 
@@ -1079 +1077 @@
                         )
                 );
                 $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 );
+                update_user_meta( $site_user, 'source_domain', $domain );
+                update_user_meta( $site_user, 'primary_blog', $current_site->blog_id );
 
                 // Unable to use update_network_option() while populating the network.
                 $wpdb->insert(