Changeset 41242 for trunk/src/wp-includes/ms-functions.php

Timestamp:

08/12/2017 01:10:24 PM (9 years ago)

Author:

flixos90

Message:

Multisite: Remove references to $wpdb->siteid and use get_current_network_id() instead.

Props sathyapulse, spacedmonkey.
Fixes #41507.

File:

• trunk/src/wp-includes/ms-functions.php (modified) (2 diffs)

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

@@ -73 +73 @@
         if ( is_array( $blogs ) && count( $blogs ) > 0 ) {
             foreach ( (array) $blogs as $blog_id => $blog ) {
-                if ( $blog->site_id != $wpdb->siteid )
+                if ( $blog->site_id != get_current_network_id() )
                     continue;
                 $details = get_site( $blog_id );
@@ -1090 +1090 @@
     }
 
-    $blog_id = wpmu_create_blog( $signup->domain, $signup->path, $signup->title, $user_id, $meta, $wpdb->siteid );
+    $blog_id = wpmu_create_blog( $signup->domain, $signup->path, $signup->title, $user_id, $meta, get_current_network_id() );
 
     // TODO: What to do if we create a user but cannot create a blog?