From 4ae3e0349f809d403e4a6c06454e281b36841a29 Mon Sep 17 00:00:00 2001 From: wpmuguru Date: Fri, 2 Apr 2010 03:27:08 +0000 Subject: [PATCH] fix folder install detection in [13926], see #12736 git-svn-id: http://svn.automattic.com/wordpress/trunk@13930 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/network.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-admin/network.php b/wp-admin/network.php index ac8c471b4..c39b3be6b 100644 --- a/wp-admin/network.php +++ b/wp-admin/network.php @@ -43,8 +43,8 @@ function network_domain_check() { * @return bool - whether subdomain install is allowed */ function allow_subdomain_install() { - $path = preg_replace( '|https?://[^/]|', '', get_option( 'siteurl' ) ); - if( strlen( $path ) > 1 || 'localhost' == $_SERVER[ 'HTTP_HOST' ] ) + $domain = preg_replace( '|https?://[^/]|', '', get_option( 'siteurl' ) ); + if( false !== strpos( $domain, '/' ) || 'localhost' == $_SERVER[ 'HTTP_HOST' ] ) return false; return true;