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
This commit is contained in:
Andrew Nacin 2013-08-29 19:31:09 +00:00
parent 7c1ea6c95c
commit f16aee063e

View File

@ -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!