Avoid validating wildcard hostnames in populate_network() when multisite is already activated.

props jeremyfelt.
fixes #25182.


git-svn-id: https://develop.svn.wordpress.org/trunk@25171 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Nacin 2013-08-29 19:30:46 +00:00
parent f6966d20b3
commit fba8c3dabe
1 changed files with 3 additions and 2 deletions

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!