Changeset 14386

Timestamp:

05/03/2010 07:23:37 PM (14 years ago)

Author:

wpmuguru

Message:

allow subdir multisite on ip address, see #12142

File:

• trunk/wp-admin/network.php (modified) (2 diffs)

trunk/wp-admin/network.php

@@ -45 +45 @@
 function allow_subdomain_install() {
     $domain = preg_replace( '|https?://[^/]|', '', get_option( 'siteurl' ) );
-    if( false !== strpos( $domain, '/' ) || 'localhost' == $_SERVER[ 'HTTP_HOST' ] )
+    if( false !== strpos( $domain, '/' ) || 'localhost' == $domain || preg_match( '|[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+|', $domain ) )
         return false;
 
@@ -107 +107 @@
     $hostname = get_clean_basedomain();
     $has_ports = strstr( $hostname, ':' );
-    if ( ( false !== $has_ports && ! in_array( $has_ports, array( ':80', ':443' ) ) )
-        || ( $no_ip = preg_match( '|[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+|', $hostname ) ) ) {
+    if ( ( false !== $has_ports && ! in_array( $has_ports, array( ':80', ':443' ) ) ) ) {
         echo '<div class="error"><p><strong>' . __( 'Error:') . '</strong> ' . __( 'You cannot install a network of sites with your server address.' ) . '</strong></p></div>';
         if ( $no_ip )