Make WordPress Core

Ticket #41805: 41805.diff

File 41805.diff, 808 bytes (added by spacedmonkey, 7 years ago)
  • src/wp-admin/includes/schema.php

     
    905905                $errors->add( 'empty_sitename', __( 'You must provide a name for your network of sites.' ) );
    906906
    907907        // Check for network collision.
    908         if ( $network_id == $wpdb->get_var( $wpdb->prepare( "SELECT id FROM $wpdb->site WHERE id = %d", $network_id ) ) )
     908        $network_id = (int) $network_id;
     909        if ( $network_id && $network = get_network( $network_id ) ) {
     910                $network_id = $network->id;
    909911                $errors->add( 'siteid_exists', __( 'The network already exists.' ) );
     912        }
    910913
    911914        if ( ! is_email( $email ) )
    912915                $errors->add( 'invalid_email', __( 'You must provide a valid email address.' ) );