Ticket #11816: 11816.2.diff

wp-admin/includes/schema.php

@@ -657 +657 @@
                 /* translators: Default category slug */
                 $cat_slug = sanitize_title( _x( 'Uncategorized', 'Default category slug' ) );
 
-                $wpdb->insert( $wpdb->sitecategories, array( 'site_id' => $network_id, 'cat_ID' => 1, 'cat_name' => __('Uncategorized'), 'category_nicename' => $cat_slug, 'last_updated' => current_time( 'mysql', true ) ) );
+                $wpdb->insert( $wpdb->sitecategories, array( 'cat_ID' => 1, 'cat_name' => __('Uncategorized'), 'category_nicename' => $cat_slug, 'last_updated' => current_time( 'mysql', true ) ) );
 
                 /* translators: Default link category slug */
                 $cat_slug = sanitize_title( _x( 'Blogroll', 'Default link category slug' ) );
 
-                $wpdb->insert( $wpdb->sitecategories, array( 'site_id' => $network_id, 'cat_ID' => 2, 'cat_name' => __('Blogroll'), 'category_nicename' => $cat_slug, 'last_updated' => current_time( 'mysql', true ) ) );
+                $wpdb->insert( $wpdb->sitecategories, array( 'cat_ID' => 2, 'cat_name' => __('Blogroll'), 'category_nicename' => $cat_slug, 'last_updated' => current_time( 'mysql', true ) ) );
 
                 $site_admins = array( $site_user->user_login );
                 $users = get_users_of_blog();
@@ -722 +722 @@
         $wpdb->query( "INSERT INTO $wpdb->sitemeta ( site_id, meta_key, meta_value ) VALUES " . $insert );
 
         $current_site->domain = $domain;
-        $current_site->path = $base;
+        $current_site->path = $path;
         $current_site->site_name = ucfirst( $domain );
 
         if ( !is_multisite() ) {