Ticket #25182: 25182.diff

src/wp-admin/includes/schema.php

@@ -928 +928 @@
         }
         $wpdb->query( "INSERT INTO $wpdb->sitemeta ( site_id, meta_key, meta_value ) VALUES " . $insert );
 
-        // When upgrading from single to multisite, assume the current site will become the main site of the network.
-        // When using populate_network() to create another network in an existing multisite environment,
-        // skip these steps since the main site of the new network has not yet been created.
+        /**
+         * When upgrading from single to multisite, assume the current site will become the main site of the network.
+         * When using populate_network() to create another network in an existing multisite environment, skip these
+         * steps since the main site of the new network has not yet been created.
+         */
         if ( ! is_multisite() ) {
                 $current_site = new stdClass;
                 $current_site->domain = $domain;
@@ -947 +949 @@
                         $wp_rewrite->set_permalink_structure( '/blog/%year%/%monthnum%/%day%/%postname%/' );
 
                 flush_rewrite_rules();
-        }
 
-        if ( $subdomain_install ) {
-                $vhost_ok = false;
-                $errstr = '';
-                $hostname = substr( md5( time() ), 0, 6 ) . '.' . $domain; // Very random hostname!
-                $page = wp_remote_get( 'http://' . $hostname, array( 'timeout' => 5, 'httpversion' => '1.1' ) );
-                if ( is_wp_error( $page ) )
-                        $errstr = $page->get_error_message();
-                elseif ( 200 == wp_remote_retrieve_response_code( $page ) )
-                                $vhost_ok = true;
+                if ( $subdomain_install ) {
+                        $vhost_ok = false;
+                        $errstr = '';
+                        $hostname = substr( md5( time() ), 0, 6 ) . '.' . $domain; // Very random hostname!
+                        $page = wp_remote_get( 'http://' . $hostname, array( 'timeout' => 5, 'httpversion' => '1.1' ) );
+                        if ( is_wp_error( $page ) )
+                                $errstr = $page->get_error_message();
+                        elseif ( 200 == wp_remote_retrieve_response_code( $page ) )
+                                        $vhost_ok = true;
 
-                if ( ! $vhost_ok ) {
-                        $msg = '<p><strong>' . __( 'Warning! Wildcard DNS may not be configured correctly!' ) . '</strong></p>';
-                        $msg .= '<p>' . sprintf( __( 'The installer attempted to contact a random hostname (<code>%1$s</code>) on your domain.' ), $hostname );
-                        if ( ! empty ( $errstr ) )
-                                $msg .= ' ' . sprintf( __( 'This resulted in an error message: %s' ), '<code>' . $errstr . '</code>' );
-                        $msg .= '</p>';
-                        $msg .= '<p>' . __( 'To use a subdomain configuration, you must have a wildcard entry in your DNS. This usually means adding a <code>*</code> hostname record pointing at your web server in your DNS configuration tool.' ) . '</p>';
-                        $msg .= '<p>' . __( 'You can still use your site but any subdomain you create may not be accessible. If you know your DNS is correct, ignore this message.' ) . '</p>';
-                        return new WP_Error( 'no_wildcard_dns', $msg );
+                        if ( ! $vhost_ok ) {
+                                $msg = '<p><strong>' . __( 'Warning! Wildcard DNS may not be configured correctly!' ) . '</strong></p>';
+                                $msg .= '<p>' . sprintf( __( 'The installer attempted to contact a random hostname (<code>%1$s</code>) on your domain.' ), $hostname );
+                                if ( ! empty ( $errstr ) )
+                                        $msg .= ' ' . sprintf( __( 'This resulted in an error message: %s' ), '<code>' . $errstr . '</code>' );
+                                $msg .= '</p>';
+                                $msg .= '<p>' . __( 'To use a subdomain configuration, you must have a wildcard entry in your DNS. This usually means adding a <code>*</code> hostname record pointing at your web server in your DNS configuration tool.' ) . '</p>';
+                                $msg .= '<p>' . __( 'You can still use your site but any subdomain you create may not be accessible. If you know your DNS is correct, ignore this message.' ) . '</p>';
+                                return new WP_Error( 'no_wildcard_dns', $msg );
+                        }
                 }
         }