Changeset 13641 for trunk/wp-admin/includes/schema.php

Timestamp:

03/10/2010 08:17:07 AM (16 years ago)

Author:

nacin

Message:

Correct subdomain handling in network.php. Pass around boolean values instead of 'yes' and 'no'. see #11816

File:

• trunk/wp-admin/includes/schema.php (modified) (4 diffs)

trunk/wp-admin/includes/schema.php

@@ -621 +621 @@
  * @param int $network_id id of network to populate
  */
-function populate_network( $network_id = 1, $domain = '', $email = '', $site_name = '', $path = '/', $vhost = 'no' ) {
+function populate_network( $network_id = 1, $domain = '', $email = '', $site_name = '', $path = '/', $subdomain_install = false ) {
     global $wpdb, $current_site, $wp_db_version, $wp_rewrite;
 
@@ -733 +733 @@
     }
 
-    if ( $vhost == 'yes' )
+    if ( $subdomain_install )
         update_option( 'permalink_structure', '/%year%/%monthnum%/%day%/%postname%/');
     else
@@ -740 +740 @@
     $wp_rewrite->flush_rules();
 
-    if ( $vhost == 'yes' ) {
+    if ( $subdomain_install ) {
         $vhost_ok = false;
         $hostname = substr( md5( time() ), 0, 6 ) . '.' . $domain; // Very random hostname!
         $page = wp_remote_get( 'http://' . $hostname, array( 'timeout' => 5, 'httpversion' => '1.1' ) );
-        if ( is_object( $page ) && is_wp_error( $page ) ) {
+        if ( is_wp_error( $page ) ) {
             foreach ( $page->get_error_messages() as $err ) {
                 $errstr = $err;
@@ -751 +751 @@
                 $vhost_ok = true;
         }
-        if ( !$vhost_ok ) {
+        if ( ! $vhost_ok ) {
             // @todo Update this to reflect the merge. Also: Multisite readme file, or remove the <blockquote> tags.
             $msg = '<h2>' . esc_html__( 'Warning! Wildcard DNS may not be configured correctly!' ) . '</h2>';