From f16aee063e1eee2c928f82e91c32009f7b2a85b3 Mon Sep 17 00:00:00 2001
From: Andrew Nacin <wp@andrewnacin.com>
Date: Thu, 29 Aug 2013 19:31:09 +0000
Subject: [PATCH] Avoid validating wildcard hostnames in populate_network()
 when multisite is already activated.

props jeremyfelt.
fixes #25182.

Built from https://develop.svn.wordpress.org/trunk@25171


git-svn-id: http://core.svn.wordpress.org/trunk@25146 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/schema.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/wp-admin/includes/schema.php b/wp-admin/includes/schema.php
index b2009958a6..4814a05d74 100644
--- a/wp-admin/includes/schema.php
+++ b/wp-admin/includes/schema.php
@@ -947,9 +947,10 @@ We hope you enjoy your new site. Thanks!
 			$wp_rewrite->set_permalink_structure( '/blog/%year%/%monthnum%/%day%/%postname%/' );
 
 		flush_rewrite_rules();
-	}
 
-	if ( $subdomain_install ) {
+		if ( ! $subdomain_install )
+			return true;
+
 		$vhost_ok = false;
 		$errstr = '';
 		$hostname = substr( md5( time() ), 0, 6 ) . '.' . $domain; // Very random hostname!