diff --git a/wp-admin/network.php b/wp-admin/network.php
index 4caf4cdea..351f7432f 100644
--- a/wp-admin/network.php
+++ b/wp-admin/network.php
@@ -40,7 +40,7 @@ function network_domain_check() {
* Allow subdomain install
*
* @since 3.0.0
- * @return bool - whether subdomain install is allowed
+ * @return bool Whether subdomain install is allowed
*/
function allow_subdomain_install() {
$domain = preg_replace( '|https?://[^/]|', '', get_option( 'siteurl' ) );
@@ -237,14 +237,14 @@ function network_step2( $errors = false ) {
echo '
' . $errors->get_error_message() . '
';
if ( $_POST ) {
- $vhost = !allow_subdomain_install() ? false : (bool) $_POST['subdomain_install'];
+ $subdomain_install = allow_subdomain_install() ? ! empty( $_POST['subdomain_install'] ) : false;
} else {
if ( is_multisite() ) {
- $vhost = is_subdomain_install();
+ $subdomain_install = is_subdomain_install();
?>
get_var( "SELECT meta_value FROM $wpdb->sitemeta WHERE site_id = 1 AND meta_key = 'subdomain_install'" );
+ $subdomain_install = (bool) $wpdb->get_var( "SELECT meta_value FROM $wpdb->sitemeta WHERE site_id = 1 AND meta_key = 'subdomain_install'" );
?>
@@ -265,7 +265,7 @@ function network_step2( $errors = false ) {
wp-config.php file in %s
above the line reading /* That’s all, stop editing! Happy blogging. */
:' ), ABSPATH ); ?>