Changeset 12921 for trunk/wp-includes/ms-settings.php

Timestamp:

02/01/2010 08:26:08 PM (15 years ago)

Author:

wpmuguru

Message:

reorganize code on ms startup. props nacin, see #11644

File:

• trunk/wp-includes/ms-settings.php (modified) (3 diffs)

trunk/wp-includes/ms-settings.php

@@ -65 +65 @@
     $reserved_blognames = array( 'page', 'comments', 'blog', 'wp-admin', 'wp-includes', 'wp-content', 'files', 'feed' );
     if ( $blogname != '' && ! in_array( $blogname, $reserved_blognames ) && ! is_file( $blogname ) )
-        $path = $path . $blogname . '/';
+        $path .= $blogname . '/';
     $current_blog = wp_cache_get( 'current_blog_' . $domain . $path, 'site-options' );
     if ( ! $current_blog ) {
@@ -82 +82 @@
         $destination = 'http://' . $current_site->domain . $current_site->path . 'wp-signup.php?new=' . str_replace( '.' . $current_site->domain, '', $domain );
     }
-    wp_redirect( $destination );
+    header( 'Location: ' . $destination );
     die();
 }
@@ -89 +89 @@
     if ( $current_site && ! $current_blog ) {
         if ( $current_site->domain != $_SERVER[ 'HTTP_HOST' ] ) {
-            wp_redirect( 'http://' . $current_site->domain . $current_site->path );
+            header( 'Location: http://' . $current_site->domain . $current_site->path );
             exit;
         }