Ticket #58423: 58423-2.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
-                        )
-                )
-        );
-
         /*
          * When upgrading from single to multisite, assume the current site will
          * become the main site of the network. When using populate_network()
@@ -1064 +1052 @@
          * created.
          */
         if ( ! is_multisite() ) {
+                $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
+                        )
+                );
+                
                 $current_site            = new stdClass();
                 $current_site->domain    = $domain;
                 $current_site->path      = $path;
@@ -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(