Ticket #23709: subdomain_wildcard.patch

wp-admin/includes/schema.php

@@ -826 +826 @@
  * @return bool|WP_Error True on success, or WP_Error on warning (with the install otherwise successful,
  *      so the error code must be checked) or failure.
  */
-function populate_network( $network_id = 1, $domain = '', $email = '', $site_name = '', $path = '/', $subdomain_install = false ) {
+function populate_network( $network_id = 1, $domain = '', $email = '', $site_name = '', $path = '/', $subdomain_install = false, $wildcard_check = true ) {
         global $wpdb, $current_site, $wp_db_version, $wp_rewrite;
 
         $errors = new WP_Error();
@@ -948 +948 @@
                 flush_rewrite_rules();
         }
 
-        if ( $subdomain_install ) {
+        if ( $subdomain_install && $wildcard_check ) {
                 $vhost_ok = false;
                 $errstr = '';
                 $hostname = substr( md5( time() ), 0, 6 ) . '.' . $domain; // Very random hostname!