Changeset 41348

Timestamp:

09/08/2017 04:32:39 PM (7 years ago)

Author:

flixos90

Message:

Multisite: Use get_network() in populate_network() to check whether a network with the given ID already exists.

When multisite is setup already, e.g. in a multi network environment, this change gives a performance benefit over the direct SQL query that was previously used. The SQL query remains in place for when setting up multisite initially as the network API is not available at that point.

Props spacedmonkey.
Fixes #41805.

File:

• trunk/src/wp-admin/includes/schema.php (modified) (1 diff)

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

@@ -906 +906 @@
 
     // Check for network collision.
-    if ( $network_id == $wpdb->get_var( $wpdb->prepare( "SELECT id FROM $wpdb->site WHERE id = %d", $network_id ) ) )
-        $errors->add( 'siteid_exists', __( 'The network already exists.' ) );
+    $network_exists = false;
+    if ( is_multisite() ) {
+        if ( get_network( (int) $network_id ) ) {
+            $errors->add( 'siteid_exists', __( 'The network already exists.' ) );
+        }
+    } else {
+        if ( $network_id == $wpdb->get_var( $wpdb->prepare( "SELECT id FROM $wpdb->site WHERE id = %d", $network_id ) ) ) {
+            $errors->add( 'siteid_exists', __( 'The network already exists.' ) );
+        }
+    }
 
     if ( ! is_email( $email ) )